ADEN-1503 Small refactoring.