Cleanup
Done with pyflakes