CXX-182 comments and minor changes after review