Just some basic cleanup