moved comments to correct place