Visualization refactor