Small changes after code review