cleanup
plotting refactor
plotting refactor