pep8, pyflake general cleanup

Just to make sure it is all still there and in reasonable shape.