Flak8 fixes
Pylint
Fix pylint errors