Minor changes after code review