address JSHint warnings and make formatting consistent

`make test` is failing, but the same is true on the master branch. :\