Minor changes suggested in code review