Cleanup

Here is the first and hopefully least controversial of a series of changes I hoped to make as part of my innovation day project.

There is one linting error that wasn't a mechanical fix - some var is not defined. What should we do there?

npm reformatted the .json to 2 space tabs instead of 4 because I did a `--save` command.