json refactored