Changes from the code review