Code review comments 3.