autopep8 pass 2