Clean up and PEP-8 formatting