Clean up UML diagram

Clean up of first draft of UML 1 diagram.