Pyflakes cleanup