Visualizer cleanup, separating macros