more cleanup work on Visualization