Tidied up some of the JSON