More PEP-8 fixes

I will try to be more assiduous about catching these in review