Various small PEP-8 fixes