minor changes from code review