[no code change] more pep8 changes
dirty commit. TODO: do not merge into master