renaming and commenting