Showing keywords only if set
Fixing flake8 styles