autopep8 a few remaining files, and general cleanup