DATAMONGO-867

Refactoring and formatter adjustments