Fixes to run and avoid duplications
pep8-ify
Fix to run