Some code review comments