PEP-8 compliance and removing shit