renaming and comments