Refactor Class Diagram