refactor JSOn format