Work on pep-8 compliance