Little changes after the code review