Added some basic cleanup.