More changes after code review