Clean up and refactor.
Cleanup, and added the ability to read from a fileName to the JSON Parser interface.