Fixes Following flake8 and pylint