more pep8 changes
final pep8 changes