cleaned up class diagrams