Untangled class diagram