Make code pep8 conformant