comments & renaming