visualisation refactor