Start working towards better pep8 compliance