flake8 fixes
Make syntax highlight use short names for compatibility with pygments stylesheets