Adding comments and cleanup of json.