Cleanup

Ran pyflakes, fixed some things