More changes according to code review