Renaming and adding comments