Refactored Visualizer