Refactored UML for class diagram