Refactoring based on suggestions from hound
Add JSON output
Finish cleaning up tests and hound violations