Pyflakes cleanup

@deiferni please have a look ...