refactored json format