Code review comments 2.