Another round of code review