Cleaning imports and pep8 syntax