DATAMONGO-693 - Applied suggested refactorings