Some minor cleanup
Some minor cleanup

Made the way we use hash keys consistent as in some places we used
- `"key": value` and others `key: value`. And removed a mighty 1 line of
code.

alphagov/whitehall,alphagov/whitehall,alphagov/whitehall,alphagov/whitehall