Comments and renaming variables