Clean up and added prettyprint json