Changes based on review

I wrote the changes in collaboration with Angus to demonstrate what I
meant and in order to keep the tests passing because of the JSON
serialiser, yeah that's right with an s.