integrate changes from code review