Updating for PEP-8