Clean up!

Wrapping up all the things.