Fix type and move comment to the proper position