Make It Work Clean Up!

Things to do
Make It Work Clean Up!