diff --git a/lib/helpers/json.dart b/lib/helpers/json.dart
index e5f288f3..a3f0a176 100644
--- a/lib/helpers/json.dart
+++ b/lib/helpers/json.dart
@@ -19,11 +19,11 @@
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 
-num toNum(String? e) {
+num stringToNum(String? e) {
   return e == null ? 0 : num.parse(e);
 }
 
-String? toString(num? e) {
+String? numToString(num? e) {
   if (e == null) {
     return null;
   }
diff --git a/lib/models/body_weight/weight_entry.dart b/lib/models/body_weight/weight_entry.dart
index ed8761bd..1fbb5dbf 100644
--- a/lib/models/body_weight/weight_entry.dart
+++ b/lib/models/body_weight/weight_entry.dart
@@ -26,7 +26,7 @@ class WeightEntry {
   @JsonKey(required: true)
   int? id;
 
-  @JsonKey(required: true, fromJson: toNum, toJson: toString)
+  @JsonKey(required: true, fromJson: stringToNum, toJson: numToString)
   late num weight;
 
   @JsonKey(required: true, toJson: toDate)
diff --git a/lib/models/body_weight/weight_entry.g.dart b/lib/models/body_weight/weight_entry.g.dart
index 59ae955d..98ab3eda 100644
--- a/lib/models/body_weight/weight_entry.g.dart
+++ b/lib/models/body_weight/weight_entry.g.dart
@@ -10,14 +10,13 @@ WeightEntry _$WeightEntryFromJson(Map<String, dynamic> json) {
   $checkKeys(json, requiredKeys: const ['id', 'weight', 'date']);
   return WeightEntry(
     id: json['id'] as int?,
-    weight: toNum(json['weight'] as String?),
+    weight: stringToNum(json['weight'] as String?),
     date: json['date'] == null ? null : DateTime.parse(json['date'] as String),
   );
 }
 
-Map<String, dynamic> _$WeightEntryToJson(WeightEntry instance) =>
-    <String, dynamic>{
+Map<String, dynamic> _$WeightEntryToJson(WeightEntry instance) => <String, dynamic>{
       'id': instance.id,
-      'weight': toString(instance.weight),
+      'weight': numToString(instance.weight),
       'date': toDate(instance.date),
     };
diff --git a/lib/models/nutrition/ingredient.dart b/lib/models/nutrition/ingredient.dart
index f04de242..69d1ce44 100644
--- a/lib/models/nutrition/ingredient.dart
+++ b/lib/models/nutrition/ingredient.dart
@@ -37,31 +37,31 @@ class Ingredient {
   final int energy;
 
   /// g per 100g of product
-  @JsonKey(required: true, fromJson: toNum, toJson: toString)
+  @JsonKey(required: true, fromJson: stringToNum, toJson: numToString)
   final num carbohydrates;
 
   /// g per 100g of product
-  @JsonKey(required: true, fromJson: toNum, toJson: toString, name: 'carbohydrates_sugar')
+  @JsonKey(required: true, fromJson: stringToNum, toJson: numToString, name: 'carbohydrates_sugar')
   final num carbohydratesSugar;
 
   /// g per 100g of product
-  @JsonKey(required: true, fromJson: toNum, toJson: toString)
+  @JsonKey(required: true, fromJson: stringToNum, toJson: numToString)
   final num protein;
 
   /// g per 100g of product
-  @JsonKey(required: true, fromJson: toNum, toJson: toString)
+  @JsonKey(required: true, fromJson: stringToNum, toJson: numToString)
   final num fat;
 
   /// g per 100g of product
-  @JsonKey(required: true, fromJson: toNum, toJson: toString, name: 'fat_saturated')
+  @JsonKey(required: true, fromJson: stringToNum, toJson: numToString, name: 'fat_saturated')
   final num fatSaturated;
 
   /// g per 100g of product
-  @JsonKey(required: true, fromJson: toNum, toJson: toString)
+  @JsonKey(required: true, fromJson: stringToNum, toJson: numToString)
   final num fibres;
 
   /// g per 100g of product
-  @JsonKey(required: true, fromJson: toNum, toJson: toString)
+  @JsonKey(required: true, fromJson: stringToNum, toJson: numToString)
   final num sodium;
 
   const Ingredient({
diff --git a/lib/models/nutrition/ingredient.g.dart b/lib/models/nutrition/ingredient.g.dart
index 7f3b791e..6ffb0a9c 100644
--- a/lib/models/nutrition/ingredient.g.dart
+++ b/lib/models/nutrition/ingredient.g.dart
@@ -25,27 +25,26 @@ Ingredient _$IngredientFromJson(Map<String, dynamic> json) {
     name: json['name'] as String,
     creationDate: DateTime.parse(json['creation_date'] as String),
     energy: json['energy'] as int,
-    carbohydrates: toNum(json['carbohydrates'] as String?),
-    carbohydratesSugar: toNum(json['carbohydrates_sugar'] as String?),
-    protein: toNum(json['protein'] as String?),
-    fat: toNum(json['fat'] as String?),
-    fatSaturated: toNum(json['fat_saturated'] as String?),
-    fibres: toNum(json['fibres'] as String?),
-    sodium: toNum(json['sodium'] as String?),
+    carbohydrates: stringToNum(json['carbohydrates'] as String?),
+    carbohydratesSugar: stringToNum(json['carbohydrates_sugar'] as String?),
+    protein: stringToNum(json['protein'] as String?),
+    fat: stringToNum(json['fat'] as String?),
+    fatSaturated: stringToNum(json['fat_saturated'] as String?),
+    fibres: stringToNum(json['fibres'] as String?),
+    sodium: stringToNum(json['sodium'] as String?),
   );
 }
 
-Map<String, dynamic> _$IngredientToJson(Ingredient instance) =>
-    <String, dynamic>{
+Map<String, dynamic> _$IngredientToJson(Ingredient instance) => <String, dynamic>{
       'id': instance.id,
       'name': instance.name,
       'creation_date': toDate(instance.creationDate),
       'energy': instance.energy,
-      'carbohydrates': toString(instance.carbohydrates),
-      'carbohydrates_sugar': toString(instance.carbohydratesSugar),
-      'protein': toString(instance.protein),
-      'fat': toString(instance.fat),
-      'fat_saturated': toString(instance.fatSaturated),
-      'fibres': toString(instance.fibres),
-      'sodium': toString(instance.sodium),
+      'carbohydrates': numToString(instance.carbohydrates),
+      'carbohydrates_sugar': numToString(instance.carbohydratesSugar),
+      'protein': numToString(instance.protein),
+      'fat': numToString(instance.fat),
+      'fat_saturated': numToString(instance.fatSaturated),
+      'fibres': numToString(instance.fibres),
+      'sodium': numToString(instance.sodium),
     };
diff --git a/lib/models/nutrition/log.dart b/lib/models/nutrition/log.dart
index cdb0155c..3cdec7cb 100644
--- a/lib/models/nutrition/log.dart
+++ b/lib/models/nutrition/log.dart
@@ -51,7 +51,7 @@ class Log {
   @JsonKey(ignore: true)
   IngredientWeightUnit? weightUnitObj;
 
-  @JsonKey(required: true, fromJson: toNum)
+  @JsonKey(required: true, fromJson: stringToNum)
   late num amount;
 
   Log({
diff --git a/lib/models/nutrition/log.g.dart b/lib/models/nutrition/log.g.dart
index 0aedd882..7e64e384 100644
--- a/lib/models/nutrition/log.g.dart
+++ b/lib/models/nutrition/log.g.dart
@@ -7,19 +7,13 @@ part of 'log.dart';
 // **************************************************************************
 
 Log _$LogFromJson(Map<String, dynamic> json) {
-  $checkKeys(json, requiredKeys: const [
-    'id',
-    'plan',
-    'datetime',
-    'ingredient',
-    'weight_unit',
-    'amount'
-  ]);
+  $checkKeys(json,
+      requiredKeys: const ['id', 'plan', 'datetime', 'ingredient', 'weight_unit', 'amount']);
   return Log(
     id: json['id'] as int?,
     ingredientId: json['ingredient'] as int,
     weightUnitId: json['weight_unit'] as int?,
-    amount: toNum(json['amount'] as String?),
+    amount: stringToNum(json['amount'] as String?),
     planId: json['plan'] as int,
     datetime: DateTime.parse(json['datetime'] as String),
     comment: json['comment'] as String?,
diff --git a/lib/models/nutrition/meal_item.dart b/lib/models/nutrition/meal_item.dart
index 578da11c..c5a11d98 100644
--- a/lib/models/nutrition/meal_item.dart
+++ b/lib/models/nutrition/meal_item.dart
@@ -45,7 +45,7 @@ class MealItem {
   @JsonKey(ignore: true)
   IngredientWeightUnit? weightUnitObj;
 
-  @JsonKey(required: true, fromJson: toNum, toJson: toString)
+  @JsonKey(required: true, fromJson: stringToNum, toJson: numToString)
   late num amount;
 
   MealItem({
diff --git a/lib/models/nutrition/meal_item.g.dart b/lib/models/nutrition/meal_item.g.dart
index 4611e7bc..e0af0526 100644
--- a/lib/models/nutrition/meal_item.g.dart
+++ b/lib/models/nutrition/meal_item.g.dart
@@ -13,7 +13,7 @@ MealItem _$MealItemFromJson(Map<String, dynamic> json) {
     mealId: json['meal'] as int?,
     ingredientId: json['ingredient'] as int,
     weightUnitId: json['weight_unit'] as int?,
-    amount: toNum(json['amount'] as String?),
+    amount: stringToNum(json['amount'] as String?),
   );
 }
 
@@ -22,5 +22,5 @@ Map<String, dynamic> _$MealItemToJson(MealItem instance) => <String, dynamic>{
       'meal': instance.mealId,
       'ingredient': instance.ingredientId,
       'weight_unit': instance.weightUnitId,
-      'amount': toString(instance.amount),
+      'amount': numToString(instance.amount),
     };
diff --git a/lib/models/workouts/log.dart b/lib/models/workouts/log.dart
index 94cd8568..8ca7762c 100644
--- a/lib/models/workouts/log.dart
+++ b/lib/models/workouts/log.dart
@@ -51,7 +51,7 @@ class Log {
   @JsonKey(ignore: true)
   late RepetitionUnit repetitionUnitObj;
 
-  @JsonKey(required: true, fromJson: toNum, toJson: toString)
+  @JsonKey(required: true, fromJson: stringToNum, toJson: numToString)
   late num weight;
 
   @JsonKey(required: true, name: 'weight_unit')
@@ -66,16 +66,17 @@ class Log {
   //@JsonKey(required: true)
   //String comment;
 
-  Log(
-      {this.id,
-      required this.exerciseId,
-      required this.workoutPlan,
-      required this.reps,
-      required this.rir,
-      required this.repetitionUnitId,
-      required this.weight,
-      required this.weightUnitId,
-      required this.date});
+  Log({
+    this.id,
+    required this.exerciseId,
+    required this.workoutPlan,
+    required this.reps,
+    required this.rir,
+    required this.repetitionUnitId,
+    required this.weight,
+    required this.weightUnitId,
+    required this.date,
+  });
 
   Log.empty();
 
diff --git a/lib/models/workouts/log.g.dart b/lib/models/workouts/log.g.dart
index 309464a4..c9717af3 100644
--- a/lib/models/workouts/log.g.dart
+++ b/lib/models/workouts/log.g.dart
@@ -24,7 +24,7 @@ Log _$LogFromJson(Map<String, dynamic> json) {
     reps: json['reps'] as int,
     rir: json['rir'] as String?,
     repetitionUnitId: json['repetition_unit'] as int,
-    weight: toNum(json['weight'] as String?),
+    weight: stringToNum(json['weight'] as String?),
     weightUnitId: json['weight_unit'] as int,
     date: DateTime.parse(json['date'] as String),
   );
@@ -37,7 +37,7 @@ Map<String, dynamic> _$LogToJson(Log instance) => <String, dynamic>{
       'reps': instance.reps,
       'rir': instance.rir,
       'repetition_unit': instance.repetitionUnitId,
-      'weight': toString(instance.weight),
+      'weight': numToString(instance.weight),
       'weight_unit': instance.weightUnitId,
       'date': toDate(instance.date),
     };
diff --git a/lib/models/workouts/session.dart b/lib/models/workouts/session.dart
index 98cff006..cdb3f130 100644
--- a/lib/models/workouts/session.dart
+++ b/lib/models/workouts/session.dart
@@ -35,7 +35,7 @@ class WorkoutSession {
   @JsonKey(required: true, toJson: toDate)
   late DateTime date;
 
-  @JsonKey(required: true, fromJson: toNum, toJson: toString)
+  @JsonKey(required: true, fromJson: stringToNum, toJson: numToString)
   late num impression;
 
   @JsonKey(required: false, defaultValue: '')
diff --git a/lib/models/workouts/session.g.dart b/lib/models/workouts/session.g.dart
index 7345d952..b00ec0c2 100644
--- a/lib/models/workouts/session.g.dart
+++ b/lib/models/workouts/session.g.dart
@@ -7,30 +7,23 @@ part of 'session.dart';
 // **************************************************************************
 
 WorkoutSession _$WorkoutSessionFromJson(Map<String, dynamic> json) {
-  $checkKeys(json, requiredKeys: const [
-    'id',
-    'workout',
-    'date',
-    'impression',
-    'time_start',
-    'time_end'
-  ]);
+  $checkKeys(json,
+      requiredKeys: const ['id', 'workout', 'date', 'impression', 'time_start', 'time_end']);
   return WorkoutSession()
     ..id = json['id'] as int?
     ..workoutId = json['workout'] as int
     ..date = DateTime.parse(json['date'] as String)
-    ..impression = toNum(json['impression'] as String?)
+    ..impression = stringToNum(json['impression'] as String?)
     ..notes = json['notes'] as String? ?? ''
     ..timeStart = stringToTime(json['time_start'] as String?)
     ..timeEnd = stringToTime(json['time_end'] as String?);
 }
 
-Map<String, dynamic> _$WorkoutSessionToJson(WorkoutSession instance) =>
-    <String, dynamic>{
+Map<String, dynamic> _$WorkoutSessionToJson(WorkoutSession instance) => <String, dynamic>{
       'id': instance.id,
       'workout': instance.workoutId,
       'date': toDate(instance.date),
-      'impression': toString(instance.impression),
+      'impression': numToString(instance.impression),
       'notes': instance.notes,
       'time_start': timeToString(instance.timeStart),
       'time_end': timeToString(instance.timeEnd),
diff --git a/lib/models/workouts/setting.dart b/lib/models/workouts/setting.dart
index bc87ae72..80d564a1 100644
--- a/lib/models/workouts/setting.dart
+++ b/lib/models/workouts/setting.dart
@@ -54,7 +54,7 @@ class Setting {
   @JsonKey(required: true)
   int? reps;
 
-  @JsonKey(required: true, fromJson: toNum, toJson: toString)
+  @JsonKey(required: true, fromJson: stringToNum, toJson: numToString)
   num? weight;
 
   @JsonKey(required: true, name: 'weight_unit')
diff --git a/lib/models/workouts/setting.g.dart b/lib/models/workouts/setting.g.dart
index 464e6eae..d99751fa 100644
--- a/lib/models/workouts/setting.g.dart
+++ b/lib/models/workouts/setting.g.dart
@@ -29,7 +29,7 @@ Setting _$SettingFromJson(Map<String, dynamic> json) {
     weightUnitId: json['weight_unit'] as int,
     comment: json['comment'] as String,
     rir: json['rir'] as String?,
-  )..weight = toNum(json['weight'] as String?);
+  )..weight = stringToNum(json['weight'] as String?);
 }
 
 Map<String, dynamic> _$SettingToJson(Setting instance) => <String, dynamic>{
@@ -39,7 +39,7 @@ Map<String, dynamic> _$SettingToJson(Setting instance) => <String, dynamic>{
       'exercise': instance.exerciseId,
       'repetition_unit': instance.repetitionUnitId,
       'reps': instance.reps,
-      'weight': toString(instance.weight),
+      'weight': numToString(instance.weight),
       'weight_unit': instance.weightUnitId,
       'comment': instance.comment,
       'rir': instance.rir,