UML cleaned!