make modifications from code review