BUM-2705 Refactorings.
BUM-2705 Refactorings.