changes due to code review