Visualisation model refactoring