Some PEP-8 formatting issues