Flake8 and double quotes fixes