[CAMEL-7963] Refactoring.