DJBL-5 | Reduce pep8 and pylint violations