made changes based on code review