Refactored Json.cs