CXX-265 Code review changes