Refactor formatter services to be more consistent with new hypermedia system