diff --git a/src/main/java/no/ntnu/queryeng/entity/ShippingCost.java b/src/main/java/no/ntnu/queryeng/entity/ShippingCost.java
index 816da4d9670a0c9ec2c1de3d4ecbb281decfad9e..c9367cbac3cca005d50107ef6be4dea4a913eeec 100644
--- a/src/main/java/no/ntnu/queryeng/entity/ShippingCost.java
+++ b/src/main/java/no/ntnu/queryeng/entity/ShippingCost.java
@@ -17,7 +17,7 @@ public class ShippingCost {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private short id;
+    private int id;
 
     @Column(name = "description")
     private String description;
@@ -35,7 +35,7 @@ public class ShippingCost {
      * @param description describes what the cost is
      * @param cost the price
      */
-    public ShippingCost(short id, String description, double cost) {
+    public ShippingCost(int id, String description, double cost) {
         if (checkId(id) && checkCost(cost) && checkDescription(description)) {
             this.description = description;
             this.cost = cost;
@@ -55,7 +55,7 @@ public class ShippingCost {
 
     // --------------------- Get methods ------------------------
 
-    public short getId() {
+    public int getId() {
         return id;
     }
 
@@ -78,7 +78,7 @@ public class ShippingCost {
      *
      * @return true if id is valid, false otherwise
      */
-    private boolean checkId(short id) {
+    private boolean checkId(int id) {
         return id > 0;
     }
 
@@ -90,11 +90,7 @@ public class ShippingCost {
      * @return true if the cost has legal value
      */
     private boolean checkCost(double cost) {
-        boolean costIsValid = false;
-        if (cost >= 0) {
-            costIsValid = true;
-        }
-        return costIsValid;
+        return cost >= 0;
     }
 
     /**