Formatted json files, code cleaned