Moved comments to correct lines