Apply the changes brought up during code review