Even more code review