Some of the code review comments