Fix various PEP-8 warnings (etc)