attempt at basic cleanup