CON-619 Code review changes