Closer to a jsonapi.org JSON API
Cleanup