changes related to code review