Cleaned up json deserialization