First round of code review feedback