Fix some more landscape issues
Fixing landscape.io & flake8 errors