clean visualization
more refactoring