Apply changes according to code review