Minor changes from code review