added new visualization and some code-clean-up