CORE-3491: some minor refactoring