PEP-8 changes (AKA Guido is very opinionated)