Big cleanup. Thanks again, pyflakes