Refactoring, change JSON format for "Fett"