Second round of code review