Non-sprint task - minor refactoring.