cleanup
Cleaning up code and plots