PRD-915 Slight refactoring