moved comments to correct location