fixing things from code review