Renaming and removing comments