Code review feedback, part 1