Visualization refactoring