Clean up LOTS of code