Tidy up

Okay, let's do some cleaning up.