Implementing changes from code review