Refactored JSON Data