Summer Clean up!

Summer Clean up!