Beautify

No functional change, just autopep8 stuff