PEP8 fixes and other changes from review feedback