more code review feedback