big clean-up in MCC data vis code