Fix flake8 warnings
Remove pylint remnants