move comment to proper place