Fixed up some basic cleanup