Use json inception
Refactor minor stuff