Clean up and addition of json data sample