Slowly converting to PEP-8