More code review feedback