renaming and modification after code review