changes from code review session