Cleaning things up more

Woo!