PEP8

We now follow PEP8 relatively strictly. There should be no FUNCTIONAL changes in this file.