refactor json
more json refactor