code review changes made