Refactor UML