Cleaned up the JSON unmarshalling.