Storage: Created a helper class for JSON format
Storage: Removed JSON formatting code