minor refactoring to align with class diagrams