implement changes from code review