Updates according to code review