move comments to where they apply