Move comments to their proper place