Simplify JSON output some more to make it easier to work with