Small refactoring towards rich domain model