Some modifications for pep8 and pylint