CAAERS-6596, apply refatoring recommended in code review.
Merge branch 'feature/CAAERS-6596' into develop