Cleanup the code a bit, thanks again, pyflakes