diff --git a/commons/src/main/java/commons/FormalIngredient.java b/commons/src/main/java/commons/FormalIngredient.java
index 4fb1eed..b977ab3 100644
--- a/commons/src/main/java/commons/FormalIngredient.java
+++ b/commons/src/main/java/commons/FormalIngredient.java
@@ -15,6 +15,11 @@ public class FormalIngredient extends RecipeIngredient implements Scalable<Forma
     private double amount;
     private String unitSuffix;
 
+    private static final int tbspToPoundConvert = 32;
+    private static final int tbspToCupConvert = 16;
+    private static final int tbspToOunceConvert = 2;
+    private static final int OunceToPoundConvert = 16;
+
     public double getAmount() {
         return amount;
     }
@@ -31,6 +36,8 @@ public class FormalIngredient extends RecipeIngredient implements Scalable<Forma
         this.unitSuffix = unitSuffix;
     }
 
+
+
     public FormalIngredient(Long id, Ingredient ingredient, double amount, String unitSuffix) {
         // For testing
         super(id, ingredient);
@@ -80,18 +87,18 @@ public class FormalIngredient extends RecipeIngredient implements Scalable<Forma
 
 
         if(currentUnit == Unit.TABLESPOON){
-            if(amount>=32){
-                return amount/32 + Unit.POUND.suffix;
+            if(amount>=tbspToPoundConvert){
+                return amount/tbspToPoundConvert + Unit.POUND.suffix;
             }
-            if(amount>=16){
-                return amount /16 + Unit.CUP.suffix;
+            if(amount>=tbspToCupConvert){
+                return amount /tbspToCupConvert + Unit.CUP.suffix;
             }
-            if(amount>=2){
-                return amount /2 + Unit.OUNCE.suffix;
+            if(amount>=tbspToOunceConvert){
+                return amount /tbspToOunceConvert + Unit.OUNCE.suffix;
             }
         }
-        if (currentUnit == Unit.OUNCE && baseAmount >= 16) {
-            return amount / 16 + Unit.POUND.suffix;
+        if (currentUnit == Unit.OUNCE && baseAmount >= OunceToPoundConvert) {
+            return amount / OunceToPoundConvert + Unit.POUND.suffix;
         }
 
         return amount + currentUnit.suffix;