UML Documentaton and small Code Cleanup