More basic cleanup, damn python