diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 5b0ad19..856e758 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -101,10 +101,9 @@ machine (for instance for :doc:`syntax highlighting in text editors
  file.yml:57:1: [error] trailing spaces (trailing-spaces)
  file.yml:60:3: [error] wrong indentation: expected 4 but found 2 (indentation)
 
-Add the ``-f json`` arguments if you need an output formatted as json.
+Add the ``-f json`` arguments if you need an output formatted as JSON.
 The output will then look like:
 
-
 ::
 
  [
diff --git a/yamllint/cli.py b/yamllint/cli.py
index 76d84ae..33af8bb 100644
--- a/yamllint/cli.py
+++ b/yamllint/cli.py
@@ -92,8 +92,6 @@ class Format(object):
             "line": problem.line,
             "char": problem.column,
             "description": problem.message,
-            "code": "yamllint",
-            "name": "yamllint",
             "severity": problem.level,
         })
 
@@ -130,6 +128,7 @@ def show_problems(problems, file, args_format, no_warn):
 
     return max_level
 
+
 def run(argv=None):
     parser = argparse.ArgumentParser(prog=APP_NAME,
                                      description=APP_DESCRIPTION)
@@ -147,7 +146,7 @@ def run(argv=None):
                               action='store',
                               help='custom configuration (as YAML source)')
     parser.add_argument('-f', '--format',
-                        choices=('parsable', 'standard', 'colored', 'auto', 'json'),
+                        choices=('parsable', 'standard', 'colored', 'json', 'auto'),
                         default='auto', help='format for parsing output')
     parser.add_argument('-s', '--strict',
                         action='store_true',