diff --git a/src/main/java/org/nfunk/jep/JEP.java b/src/main/java/org/nfunk/jep/JEP.java
index 8257398476..281afd0847 100644
--- a/src/main/java/org/nfunk/jep/JEP.java
+++ b/src/main/java/org/nfunk/jep/JEP.java
@@ -242,8 +242,8 @@ public void addFunction(String functionName, PostfixMathCommandI function)
     public void addStandardConstants()
     {
         // add constants to Symbol Table
-        this.symTab.addConstant("pi", new Double(Math.PI));
-        this.symTab.addConstant("e", new Double(Math.E));
+        this.symTab.addConstant("pi", Double.valueOf(Math.PI));
+        this.symTab.addConstant("e", Double.valueOf(Math.E));
     }
 
     /**
@@ -306,7 +306,7 @@ public void addStandardFunctions()
      */
     public Double addVariable(String name, double value)
     {
-        final Double object = new Double(value);
+        final Double object = Double.valueOf(value);
         this.symTab.makeVarIfNeeded(name, object);
         return object;
     }
diff --git a/src/main/java/org/nfunk/jep/JJTParserState.java b/src/main/java/org/nfunk/jep/JJTParserState.java
index a2c96c9ac4..d8e4c4ddc5 100644
--- a/src/main/java/org/nfunk/jep/JJTParserState.java
+++ b/src/main/java/org/nfunk/jep/JJTParserState.java
@@ -104,7 +104,7 @@ boolean nodeCreated()
 
     void openNodeScope(Node n)
     {
-        this.marks.push(new Integer(this.mk));
+        this.marks.push(Integer.valueOf(this.mk));
         this.mk = this.sp;
         n.jjtOpen();
     }
diff --git a/src/main/java/org/nfunk/jep/Variable.java b/src/main/java/org/nfunk/jep/Variable.java
index b09718f71d..31adbbf5b0 100644
--- a/src/main/java/org/nfunk/jep/Variable.java
+++ b/src/main/java/org/nfunk/jep/Variable.java
@@ -33,7 +33,7 @@ public class Variable extends Observable
     private Object   value;
     private boolean  isConstant = false;
     private boolean  validValue = false;
-    // private static final Double ZERO = new Double(0.0);
+    // private static final Double ZERO = Double.valueOf(0.0);
 
     /**
      * Constructors are protected. Variables should only
diff --git a/src/main/java/org/nfunk/jep/function/Abs.java b/src/main/java/org/nfunk/jep/function/Abs.java
index 7dd1b81332..40e765850d 100644
--- a/src/main/java/org/nfunk/jep/function/Abs.java
+++ b/src/main/java/org/nfunk/jep/function/Abs.java
@@ -21,8 +21,8 @@ public Abs()
 
     public Object abs(Object param) throws ParseException
     {
-        if (param instanceof Complex) return new Double(((Complex) param).abs());
-        else if (param instanceof Number) return new Double(Math.abs(((Number) param).doubleValue()));
+        if (param instanceof Complex) return Double.valueOf(((Complex) param).abs());
+        else if (param instanceof Number) return Double.valueOf(Math.abs(((Number) param).doubleValue()));
 
         throw new ParseException("Invalid parameter type");
     }
diff --git a/src/main/java/org/nfunk/jep/function/Add.java b/src/main/java/org/nfunk/jep/function/Add.java
index bc9be25957..7f4a1780b6 100644
--- a/src/main/java/org/nfunk/jep/function/Add.java
+++ b/src/main/java/org/nfunk/jep/function/Add.java
@@ -33,7 +33,7 @@ public Complex add(Complex c, Number d)
 
     public Double add(Number d1, Number d2)
     {
-        return new Double(d1.doubleValue() + d2.doubleValue());
+        return Double.valueOf(d1.doubleValue() + d2.doubleValue());
     }
 
     public Object add(Object param1, Object param2) throws ParseException
diff --git a/src/main/java/org/nfunk/jep/function/ArcCosine.java b/src/main/java/org/nfunk/jep/function/ArcCosine.java
index 75fd0500b3..a028f8d969 100644
--- a/src/main/java/org/nfunk/jep/function/ArcCosine.java
+++ b/src/main/java/org/nfunk/jep/function/ArcCosine.java
@@ -29,7 +29,7 @@ public ArcCosine()
     public Object acos(Object param) throws ParseException
     {
         if (param instanceof Complex) return ((Complex) param).acos();
-        else if (param instanceof Number) return new Double(Math.acos(((Number) param).doubleValue()));
+        else if (param instanceof Number) return Double.valueOf(Math.acos(((Number) param).doubleValue()));
 
         throw new ParseException("Invalid parameter type");
     }
diff --git a/src/main/java/org/nfunk/jep/function/ArcCosineH.java b/src/main/java/org/nfunk/jep/function/ArcCosineH.java
index 87012f125d..42976fd470 100644
--- a/src/main/java/org/nfunk/jep/function/ArcCosineH.java
+++ b/src/main/java/org/nfunk/jep/function/ArcCosineH.java
@@ -35,7 +35,7 @@ else if (param instanceof Number)
             if (val >= 1.0)
             {
                 final double res = Math.log(val + Math.sqrt(val * val - 1));
-                return new Double(res);
+                return Double.valueOf(res);
             }
             else
             {
diff --git a/src/main/java/org/nfunk/jep/function/ArcSine.java b/src/main/java/org/nfunk/jep/function/ArcSine.java
index 7500b9e72b..c9a0d20222 100644
--- a/src/main/java/org/nfunk/jep/function/ArcSine.java
+++ b/src/main/java/org/nfunk/jep/function/ArcSine.java
@@ -23,7 +23,7 @@ public ArcSine()
     public Object asin(Object param) throws ParseException
     {
         if (param instanceof Complex) return ((Complex) param).asin();
-        else if (param instanceof Number) return new Double(Math.asin(((Number) param).doubleValue()));
+        else if (param instanceof Number) return Double.valueOf(Math.asin(((Number) param).doubleValue()));
 
         throw new ParseException("Invalid parameter type");
     }
diff --git a/src/main/java/org/nfunk/jep/function/ArcSineH.java b/src/main/java/org/nfunk/jep/function/ArcSineH.java
index be114d1678..40b4e09727 100644
--- a/src/main/java/org/nfunk/jep/function/ArcSineH.java
+++ b/src/main/java/org/nfunk/jep/function/ArcSineH.java
@@ -33,7 +33,7 @@ else if (param instanceof Number)
         {
             final double val = ((Number) param).doubleValue();
             final double res = Math.log(val + Math.sqrt(val * val + 1));
-            return new Double(res);
+            return Double.valueOf(res);
             // Complex temp = new Complex(((Number)param).doubleValue(),0.0);
             // return temp.asinh();
         }
diff --git a/src/main/java/org/nfunk/jep/function/ArcTanH.java b/src/main/java/org/nfunk/jep/function/ArcTanH.java
index 2f9449d158..2d715057cf 100644
--- a/src/main/java/org/nfunk/jep/function/ArcTanH.java
+++ b/src/main/java/org/nfunk/jep/function/ArcTanH.java
@@ -35,7 +35,7 @@ else if (param instanceof Number)
             if (val > -1.0 && val < 1)
             {
                 final double res = Math.log((1 + val) / (1 - val)) / 2;
-                return new Double(res);
+                return Double.valueOf(res);
             }
             else
             {
diff --git a/src/main/java/org/nfunk/jep/function/ArcTangent.java b/src/main/java/org/nfunk/jep/function/ArcTangent.java
index 35353ced29..e8671983be 100644
--- a/src/main/java/org/nfunk/jep/function/ArcTangent.java
+++ b/src/main/java/org/nfunk/jep/function/ArcTangent.java
@@ -22,7 +22,7 @@ public ArcTangent()
     public Object atan(Object param) throws ParseException
     {
         if (param instanceof Complex) return ((Complex) param).atan();
-        else if (param instanceof Number) return new Double(Math.atan(((Number) param).doubleValue()));
+        else if (param instanceof Number) return Double.valueOf(Math.atan(((Number) param).doubleValue()));
 
         throw new ParseException("Invalid parameter type");
     }
diff --git a/src/main/java/org/nfunk/jep/function/ArcTangent2.java b/src/main/java/org/nfunk/jep/function/ArcTangent2.java
index 88b792ddd5..1f66fadf51 100644
--- a/src/main/java/org/nfunk/jep/function/ArcTangent2.java
+++ b/src/main/java/org/nfunk/jep/function/ArcTangent2.java
@@ -35,7 +35,7 @@ public void run(Stack inStack) throws ParseException
         {
             final double y = ((Number) param1).doubleValue();
             final double x = ((Number) param2).doubleValue();
-            inStack.push(new Double(Math.atan2(y, x)));// push the result on the
+            inStack.push(Double.valueOf(Math.atan2(y, x)));// push the result on the
                                                        // inStack
         }
         else throw new ParseException("Invalid parameter type");
diff --git a/src/main/java/org/nfunk/jep/function/Arg.java b/src/main/java/org/nfunk/jep/function/Arg.java
index 420420e8f6..36b424827d 100644
--- a/src/main/java/org/nfunk/jep/function/Arg.java
+++ b/src/main/java/org/nfunk/jep/function/Arg.java
@@ -20,7 +20,7 @@
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class Arg extends PostfixMathCommand
 {
-    private static final Double ONE = new Double(1.0);
+    private static final Double ONE = Double.valueOf(1.0);
 
     public Arg()
     {
@@ -29,7 +29,7 @@ public Arg()
 
     public Number arg(Object param) throws ParseException
     {
-        if (param instanceof Complex) return new Double(((Complex) param).arg());
+        if (param instanceof Complex) return Double.valueOf(((Complex) param).arg());
         else if (param instanceof Number) return Arg.ONE;
         throw new ParseException("Invalid parameter type");
     }
diff --git a/src/main/java/org/nfunk/jep/function/Ceil.java b/src/main/java/org/nfunk/jep/function/Ceil.java
index 187e324eb5..36661039d5 100644
--- a/src/main/java/org/nfunk/jep/function/Ceil.java
+++ b/src/main/java/org/nfunk/jep/function/Ceil.java
@@ -21,8 +21,8 @@ public Ceil()
 
     public Object abs(Object param) throws ParseException
     {
-        if (param instanceof Complex) return Math.ceil(new Double(((Complex) param).abs()));
-        else if (param instanceof Number) return Math.ceil(new Double(Math.abs(((Number) param).doubleValue())));
+        if (param instanceof Complex) return Math.ceil(Double.valueOf(((Complex) param).abs()));
+        else if (param instanceof Number) return Math.ceil(Double.valueOf(Math.abs(((Number) param).doubleValue())));
 
         throw new ParseException("Invalid parameter type");
     }
diff --git a/src/main/java/org/nfunk/jep/function/Comparative.java b/src/main/java/org/nfunk/jep/function/Comparative.java
index 4170f89697..c68e527757 100644
--- a/src/main/java/org/nfunk/jep/function/Comparative.java
+++ b/src/main/java/org/nfunk/jep/function/Comparative.java
@@ -24,8 +24,8 @@
  * @since 2.3.0 beta 2 changed the internal lt,gt,le,ge,ne and eq method to
  *        return boolean.
  *        If this breaks anything use
- *        if(lt(obj1,obj2)) inStack.push(new Double(1));
- *        else inStack.push(new Double(0));
+ *        if(lt(obj1,obj2)) inStack.push(Double.valueOf(1));
+ *        else inStack.push(Double.valueOf(0));
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class Comparative extends PostfixMathCommand
@@ -80,7 +80,7 @@ public boolean ge(Object param1, Object param2) throws ParseException
      * double x = ((Number)param1).doubleValue();
      * double y = ((Number)param2).doubleValue();
      * int r = (x>=y) ? 1 : 0;
-     * return new Double(r);
+     * return Double.valueOf(r);
      * }
      * throw new
      * ParseException(">= not defined for object of type "+param1.getClass().
@@ -99,7 +99,7 @@ public boolean ge(Object param1, Object param2) throws ParseException
      * default:
      * throw new ParseException("Relational operator type error");
      * }
-     * inStack.push(new Double(r));//push the result on the inStack
+     * inStack.push(Double.valueOf(r));//push the result on the inStack
      * }
      * else if ((param1 instanceof Number) && (param2 instanceof Number))
      * {
@@ -129,7 +129,7 @@ public boolean ge(Object param1, Object param2) throws ParseException
      * default:
      * throw new ParseException("Unknown relational operator");
      * }
-     * inStack.push(new Double(r));//push the result on the inStack
+     * inStack.push(Double.valueOf(r));//push the result on the inStack
      * }
      * else if ((param1 instanceof String) && (param2 instanceof String))
      * {
@@ -145,7 +145,7 @@ public boolean ge(Object param1, Object param2) throws ParseException
      * default:
      * throw new ParseException("Relational operator type error");
      * }
-     * inStack.push(new Double(r));//push the result on the inStack
+     * inStack.push(Double.valueOf(r));//push the result on the inStack
      * } else
      * {
      * throw new ParseException("Invalid parameter type");
@@ -243,8 +243,8 @@ public void run(Stack inStack) throws ParseException
             res = this.eq(param1, param2);
             break;
         }
-        if (res) inStack.push(new Double(1));
-        else inStack.push(new Double(0));
+        if (res) inStack.push(Double.valueOf(1));
+        else inStack.push(Double.valueOf(0));
     }
 
     /**
diff --git a/src/main/java/org/nfunk/jep/function/Cosine.java b/src/main/java/org/nfunk/jep/function/Cosine.java
index a2acc273d6..f25928aa10 100644
--- a/src/main/java/org/nfunk/jep/function/Cosine.java
+++ b/src/main/java/org/nfunk/jep/function/Cosine.java
@@ -22,7 +22,7 @@ public Cosine()
     public Object cos(Object param) throws ParseException
     {
         if (param instanceof Complex) return ((Complex) param).cos();
-        else if (param instanceof Number) return new Double(Math.cos(((Number) param).doubleValue()));
+        else if (param instanceof Number) return Double.valueOf(Math.cos(((Number) param).doubleValue()));
 
         throw new ParseException("Invalid parameter type");
     }
diff --git a/src/main/java/org/nfunk/jep/function/CosineH.java b/src/main/java/org/nfunk/jep/function/CosineH.java
index 0e93f942ae..06e4a36cde 100644
--- a/src/main/java/org/nfunk/jep/function/CosineH.java
+++ b/src/main/java/org/nfunk/jep/function/CosineH.java
@@ -25,7 +25,7 @@ public Object cosh(Object param) throws ParseException
         else if (param instanceof Number)
         {
             final double value = ((Number) param).doubleValue();
-            return new Double((Math.exp(value) + Math.exp(-value)) / 2);
+            return Double.valueOf((Math.exp(value) + Math.exp(-value)) / 2);
         }
 
         throw new ParseException("Invalid parameter type");
diff --git a/src/main/java/org/nfunk/jep/function/Divide.java b/src/main/java/org/nfunk/jep/function/Divide.java
index f0ad25bf5e..3a84e99ab3 100644
--- a/src/main/java/org/nfunk/jep/function/Divide.java
+++ b/src/main/java/org/nfunk/jep/function/Divide.java
@@ -49,7 +49,7 @@ public Complex div(Number d, Complex c)
 
     public Double div(Number d1, Number d2)
     {
-        return new Double(d1.doubleValue() / d2.doubleValue());
+        return Double.valueOf(d1.doubleValue() / d2.doubleValue());
     }
 
     public Vector div(Number d, Vector v)
diff --git a/src/main/java/org/nfunk/jep/function/Exp.java b/src/main/java/org/nfunk/jep/function/Exp.java
index c50ad68e42..db4a08251b 100644
--- a/src/main/java/org/nfunk/jep/function/Exp.java
+++ b/src/main/java/org/nfunk/jep/function/Exp.java
@@ -40,7 +40,7 @@ public Object exp(Object param) throws ParseException
             final double mod = Math.exp(x);
             return new Complex(mod * Math.cos(y), mod * Math.sin(y));
         }
-        else if (param instanceof Number) return new Double(Math.exp(((Number) param).doubleValue()));
+        else if (param instanceof Number) return Double.valueOf(Math.exp(((Number) param).doubleValue()));
 
         throw new ParseException("Invalid parameter type");
     }
diff --git a/src/main/java/org/nfunk/jep/function/Floor.java b/src/main/java/org/nfunk/jep/function/Floor.java
index 22c535a77f..188b603b42 100644
--- a/src/main/java/org/nfunk/jep/function/Floor.java
+++ b/src/main/java/org/nfunk/jep/function/Floor.java
@@ -21,8 +21,8 @@ public Floor()
 
     public Object abs(Object param) throws ParseException
     {
-        if (param instanceof Complex) return Math.floor(new Double(((Complex) param).abs()));
-        else if (param instanceof Number) return Math.floor(new Double(Math.abs(((Number) param).doubleValue())));
+        if (param instanceof Complex) return Math.floor(Double.valueOf(((Complex) param).abs()));
+        else if (param instanceof Number) return Math.floor(Double.valueOf(Math.abs(((Number) param).doubleValue())));
 
         throw new ParseException("Invalid parameter type");
     }
diff --git a/src/main/java/org/nfunk/jep/function/Guassian.java b/src/main/java/org/nfunk/jep/function/Guassian.java
index d1d40a3b31..f089eaef5a 100644
--- a/src/main/java/org/nfunk/jep/function/Guassian.java
+++ b/src/main/java/org/nfunk/jep/function/Guassian.java
@@ -19,7 +19,7 @@ public Guassian()
     public void run(Stack inStack) throws ParseException
     {
         this.checkStack(inStack);// check the stack
-        inStack.push(new Double(this.rand.nextGaussian()));
+        inStack.push(Double.valueOf(this.rand.nextGaussian()));
         return;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/org/nfunk/jep/function/Imaginary.java b/src/main/java/org/nfunk/jep/function/Imaginary.java
index d1fbc89f72..b37ae80834 100644
--- a/src/main/java/org/nfunk/jep/function/Imaginary.java
+++ b/src/main/java/org/nfunk/jep/function/Imaginary.java
@@ -22,8 +22,8 @@ public Imaginary()
     public Number im(Object param) throws ParseException
     {
 
-        if (param instanceof Complex) return new Double(((Complex) param).im());
-        else if (param instanceof Number) return new Double(0);
+        if (param instanceof Complex) return Double.valueOf(((Complex) param).im());
+        else if (param instanceof Number) return Double.valueOf(0);
 
         throw new ParseException("Invalid parameter type");
     }
diff --git a/src/main/java/org/nfunk/jep/function/Logarithm.java b/src/main/java/org/nfunk/jep/function/Logarithm.java
index 19b740f552..d1e0a00603 100644
--- a/src/main/java/org/nfunk/jep/function/Logarithm.java
+++ b/src/main/java/org/nfunk/jep/function/Logarithm.java
@@ -34,7 +34,7 @@ public Object log(Object param) throws ParseException
         else if (param instanceof Number)
         {
             final double num = ((Number) param).doubleValue();
-            if (num > 0) return new Double(Math.log(num) / Logarithm.LOG10);
+            if (num > 0) return Double.valueOf(Math.log(num) / Logarithm.LOG10);
             else
             {
                 final Complex temp = new Complex(num);
diff --git a/src/main/java/org/nfunk/jep/function/Logical.java b/src/main/java/org/nfunk/jep/function/Logical.java
index 413ee0be4d..f9ddcb5ada 100644
--- a/src/main/java/org/nfunk/jep/function/Logical.java
+++ b/src/main/java/org/nfunk/jep/function/Logical.java
@@ -52,7 +52,7 @@ public void run(Stack inStack) throws ParseException
                 r = 0;
             }
 
-            inStack.push(new Double(r)); // push the result on the inStack
+            inStack.push(Double.valueOf(r)); // push the result on the inStack
         }
         else throw new ParseException("Invalid parameter type");
         return;
diff --git a/src/main/java/org/nfunk/jep/function/Modulus.java b/src/main/java/org/nfunk/jep/function/Modulus.java
index a37c83ad37..e55d28da6f 100644
--- a/src/main/java/org/nfunk/jep/function/Modulus.java
+++ b/src/main/java/org/nfunk/jep/function/Modulus.java
@@ -33,7 +33,7 @@ public void run(Stack inStack) throws ParseException
 
             final double result = dividend % divisor;
 
-            inStack.push(new Double(result));
+            inStack.push(Double.valueOf(result));
         }
         else throw new ParseException("Invalid parameter type");
         return;
diff --git a/src/main/java/org/nfunk/jep/function/Multiply.java b/src/main/java/org/nfunk/jep/function/Multiply.java
index c7771dced2..7b277e8ae6 100644
--- a/src/main/java/org/nfunk/jep/function/Multiply.java
+++ b/src/main/java/org/nfunk/jep/function/Multiply.java
@@ -33,7 +33,7 @@ public Complex mul(Complex c, Number d)
 
     public Double mul(Number d1, Number d2)
     {
-        return new Double(d1.doubleValue() * d2.doubleValue());
+        return Double.valueOf(d1.doubleValue() * d2.doubleValue());
     }
 
     public Object mul(Object param1, Object param2) throws ParseException
diff --git a/src/main/java/org/nfunk/jep/function/NaturalLogarithm.java b/src/main/java/org/nfunk/jep/function/NaturalLogarithm.java
index 642b8f00e5..81cf14518b 100644
--- a/src/main/java/org/nfunk/jep/function/NaturalLogarithm.java
+++ b/src/main/java/org/nfunk/jep/function/NaturalLogarithm.java
@@ -31,7 +31,7 @@ else if (param instanceof Number)
         {
             // Now returns Complex if param is <0
             final double num = ((Number) param).doubleValue();
-            if (num > 0) return new Double(Math.log(num));
+            if (num > 0) return Double.valueOf(Math.log(num));
             else
             {
                 final Complex temp = new Complex(num);
diff --git a/src/main/java/org/nfunk/jep/function/Not.java b/src/main/java/org/nfunk/jep/function/Not.java
index 2ac21efa4c..78e62af602 100644
--- a/src/main/java/org/nfunk/jep/function/Not.java
+++ b/src/main/java/org/nfunk/jep/function/Not.java
@@ -27,7 +27,7 @@ public void run(Stack inStack) throws ParseException
         if (param instanceof Number)
         {
             final int r = ((Number) param).doubleValue() == 0 ? 1 : 0;
-            inStack.push(new Double(r));// push the result on the inStack
+            inStack.push(Double.valueOf(r));// push the result on the inStack
         }
         else throw new ParseException("Invalid parameter type");
         return;
diff --git a/src/main/java/org/nfunk/jep/function/Power.java b/src/main/java/org/nfunk/jep/function/Power.java
index e620282655..f92fbc3cde 100644
--- a/src/main/java/org/nfunk/jep/function/Power.java
+++ b/src/main/java/org/nfunk/jep/function/Power.java
@@ -23,7 +23,7 @@ public Object power(Complex c1, Complex c2)
     {
         final Complex temp = c1.power(c2);
 
-        if (temp.im() == 0) return new Double(temp.re());
+        if (temp.im() == 0) return Double.valueOf(temp.re());
         else return temp;
     }
 
@@ -31,7 +31,7 @@ public Object power(Complex c, Number d)
     {
         final Complex temp = c.power(d.doubleValue());
 
-        if (temp.im() == 0) return new Double(temp.re());
+        if (temp.im() == 0) return Double.valueOf(temp.re());
         else return temp;
     }
 
@@ -40,7 +40,7 @@ public Object power(Number d, Complex c)
         final Complex base = new Complex(d.doubleValue(), 0.0);
         final Complex temp = base.power(c);
 
-        if (temp.im() == 0) return new Double(temp.re());
+        if (temp.im() == 0) return Double.valueOf(temp.re());
         else return temp;
     }
 
@@ -51,7 +51,7 @@ public Object power(Number d1, Number d2)
             final Complex c = new Complex(d1.doubleValue(), 0.0);
             return c.power(d2.doubleValue());
         }
-        else return new Double(Math.pow(d1.doubleValue(), d2.doubleValue()));
+        else return Double.valueOf(Math.pow(d1.doubleValue(), d2.doubleValue()));
     }
 
     public Object power(Object param1, Object param2) throws ParseException
diff --git a/src/main/java/org/nfunk/jep/function/Random.java b/src/main/java/org/nfunk/jep/function/Random.java
index 7391c624ab..b48f2dfcc5 100644
--- a/src/main/java/org/nfunk/jep/function/Random.java
+++ b/src/main/java/org/nfunk/jep/function/Random.java
@@ -26,7 +26,7 @@ public Random()
     public void run(Stack inStack) throws ParseException
     {
         this.checkStack(inStack);// check the stack
-        inStack.push(new Double(Math.random()));
+        inStack.push(Double.valueOf(Math.random()));
         return;
     }
 }
diff --git a/src/main/java/org/nfunk/jep/function/Real.java b/src/main/java/org/nfunk/jep/function/Real.java
index 0c3db0fd70..90074d55e4 100644
--- a/src/main/java/org/nfunk/jep/function/Real.java
+++ b/src/main/java/org/nfunk/jep/function/Real.java
@@ -21,7 +21,7 @@ public Real()
 
     public Number re(Object param) throws ParseException
     {
-        if (param instanceof Complex) return new Double(((Complex) param).re());
+        if (param instanceof Complex) return Double.valueOf(((Complex) param).re());
         else if (param instanceof Number) return (Number) param;
 
         throw new ParseException("Invalid parameter type");
diff --git a/src/main/java/org/nfunk/jep/function/Sine.java b/src/main/java/org/nfunk/jep/function/Sine.java
index 9be0612d92..fda6fea0e5 100644
--- a/src/main/java/org/nfunk/jep/function/Sine.java
+++ b/src/main/java/org/nfunk/jep/function/Sine.java
@@ -32,7 +32,7 @@ public void run(Stack inStack) throws ParseException
     public Object sin(Object param) throws ParseException
     {
         if (param instanceof Complex) return ((Complex) param).sin();
-        else if (param instanceof Number) return new Double(Math.sin(((Number) param).doubleValue()));
+        else if (param instanceof Number) return Double.valueOf(Math.sin(((Number) param).doubleValue()));
 
         throw new ParseException("Invalid parameter type");
     }
diff --git a/src/main/java/org/nfunk/jep/function/SineH.java b/src/main/java/org/nfunk/jep/function/SineH.java
index 4b8787e7d9..09fbef487b 100644
--- a/src/main/java/org/nfunk/jep/function/SineH.java
+++ b/src/main/java/org/nfunk/jep/function/SineH.java
@@ -34,7 +34,7 @@ public Object sinh(Object param) throws ParseException
         else if (param instanceof Number)
         {
             final double value = ((Number) param).doubleValue();
-            return new Double((Math.exp(value) - Math.exp(-value)) / 2);
+            return Double.valueOf((Math.exp(value) - Math.exp(-value)) / 2);
         }
 
         throw new ParseException("Invalid parameter type");
diff --git a/src/main/java/org/nfunk/jep/function/SquareRoot.java b/src/main/java/org/nfunk/jep/function/SquareRoot.java
index ff5da8d38f..fd991a574b 100644
--- a/src/main/java/org/nfunk/jep/function/SquareRoot.java
+++ b/src/main/java/org/nfunk/jep/function/SquareRoot.java
@@ -47,7 +47,7 @@ public Object sqrt(Object param) throws ParseException
 
             // a value less than 0 will produce a complex result
             if (value < 0.0) return new Complex(value).sqrt();
-            else return new Double(Math.sqrt(value));
+            else return Double.valueOf(Math.sqrt(value));
         }
 
         throw new ParseException("Invalid parameter type");
diff --git a/src/main/java/org/nfunk/jep/function/Subtract.java b/src/main/java/org/nfunk/jep/function/Subtract.java
index 4df2c5af7b..5b74ce05fa 100644
--- a/src/main/java/org/nfunk/jep/function/Subtract.java
+++ b/src/main/java/org/nfunk/jep/function/Subtract.java
@@ -49,7 +49,7 @@ public Complex sub(Number d, Complex c)
 
     public Double sub(Number d1, Number d2)
     {
-        return new Double(d1.doubleValue() - d2.doubleValue());
+        return Double.valueOf(d1.doubleValue() - d2.doubleValue());
     }
 
     public Object sub(Object param1, Object param2) throws ParseException
diff --git a/src/main/java/org/nfunk/jep/function/TanH.java b/src/main/java/org/nfunk/jep/function/TanH.java
index b93e7c1ff3..34897f8f9f 100644
--- a/src/main/java/org/nfunk/jep/function/TanH.java
+++ b/src/main/java/org/nfunk/jep/function/TanH.java
@@ -34,7 +34,7 @@ public Object tanh(Object param) throws ParseException
         else if (param instanceof Number)
         {
             final double value = ((Number) param).doubleValue();
-            return new Double((Math.exp(value) - Math.exp(-value)) / (Math.pow(Math.E, value) + Math.pow(Math.E,
+            return Double.valueOf((Math.exp(value) - Math.exp(-value)) / (Math.pow(Math.E, value) + Math.pow(Math.E,
                     -value)));
         }
         throw new ParseException("Invalid parameter type");
diff --git a/src/main/java/org/nfunk/jep/function/Tangent.java b/src/main/java/org/nfunk/jep/function/Tangent.java
index df38c45d00..1bdc090dff 100644
--- a/src/main/java/org/nfunk/jep/function/Tangent.java
+++ b/src/main/java/org/nfunk/jep/function/Tangent.java
@@ -31,7 +31,7 @@ public void run(Stack inStack) throws ParseException
     public Object tan(Object param) throws ParseException
     {
         if (param instanceof Complex) return ((Complex) param).tan();
-        else if (param instanceof Number) return new Double(Math.tan(((Number) param).doubleValue()));
+        else if (param instanceof Number) return Double.valueOf(Math.tan(((Number) param).doubleValue()));
 
         throw new ParseException("Invalid parameter type");
     }
diff --git a/src/main/java/org/nfunk/jep/function/UMinus.java b/src/main/java/org/nfunk/jep/function/UMinus.java
index 597b37db6f..410b098c4d 100644
--- a/src/main/java/org/nfunk/jep/function/UMinus.java
+++ b/src/main/java/org/nfunk/jep/function/UMinus.java
@@ -33,7 +33,7 @@ public void run(Stack inStack) throws ParseException
     public Object umin(Object param) throws ParseException
     {
         if (param instanceof Complex) return ((Complex) param).neg();
-        if (param instanceof Number) return new Double(-((Number) param).doubleValue());
+        if (param instanceof Number) return Double.valueOf(-((Number) param).doubleValue());
 
         throw new ParseException("Invalid parameter type");
     }
diff --git a/src/main/java/org/nfunk/jep/type/DoubleNumberFactory.java b/src/main/java/org/nfunk/jep/type/DoubleNumberFactory.java
index c3394a10b5..080520d863 100644
--- a/src/main/java/org/nfunk/jep/type/DoubleNumberFactory.java
+++ b/src/main/java/org/nfunk/jep/type/DoubleNumberFactory.java
@@ -24,9 +24,9 @@ public class DoubleNumberFactory implements NumberFactory
     @Override
     public Object createNumber(String value)
     {
-        return new Double(value);
+        return Double.valueOf(value);
     }
-    // public Object createNumber(double value) { return new Double(value); }
+    // public Object createNumber(double value) { return Double.valueOf(value); }
     // public Object createNumber(Double value) { return value; }
 
 }
diff --git a/src/main/java/pokecube/core/client/EventsHandlerClient.java b/src/main/java/pokecube/core/client/EventsHandlerClient.java
index ea5dc8f411..4362046141 100644
--- a/src/main/java/pokecube/core/client/EventsHandlerClient.java
+++ b/src/main/java/pokecube/core/client/EventsHandlerClient.java
@@ -241,10 +241,7 @@ public static void onKeyInput(final KeyInputEvent evt)
         final ClientPlayerEntity player = Minecraft.getInstance().player;
         // We only handle these ingame anyway.
         if (player == null) return;
-        if (InputMappings.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_KEY_F3) && evt.getKey() == GLFW.GLFW_KEY_D)
-        {
-            GuiInfoMessages.clear();
-        }
+        if (InputMappings.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_KEY_F3) && evt.getKey() == GLFW.GLFW_KEY_D) GuiInfoMessages.clear();
 
         if (evt.getKey() == GLFW.GLFW_KEY_F5) if (AnimationGui.entry != null && Minecraft
                 .getInstance().screen instanceof AnimationGui)
diff --git a/src/main/java/pokecube/core/client/gui/AnimationGui.java b/src/main/java/pokecube/core/client/gui/AnimationGui.java
index 8e80e72005..024fb67217 100644
--- a/src/main/java/pokecube/core/client/gui/AnimationGui.java
+++ b/src/main/java/pokecube/core/client/gui/AnimationGui.java
@@ -132,7 +132,7 @@ public static void printSizes()
     {
         final Map<String, Float> sizeMap = Maps.newHashMap();
         for (final PokedexEntry e : AnimationGui.sizes.keySet())
-            sizeMap.put(e.getTrimmedName(), new Float(AnimationGui.sizes.getOrDefault(e, 0f)));
+            sizeMap.put(e.getTrimmedName(), Float.valueOf(AnimationGui.sizes.getOrDefault(e, 0f)));
 
         try
         {
diff --git a/src/main/java/pokecube/core/interfaces/capabilities/impl/PokemobBase.java b/src/main/java/pokecube/core/interfaces/capabilities/impl/PokemobBase.java
index 2e6de4e65f..f6d644312a 100644
--- a/src/main/java/pokecube/core/interfaces/capabilities/impl/PokemobBase.java
+++ b/src/main/java/pokecube/core/interfaces/capabilities/impl/PokemobBase.java
@@ -82,10 +82,10 @@ public void register(final IPokemob pokemob)
             this.HELDITEMDW = sync.register(new Data_ItemStack(), ItemStack.EMPTY);
 
             // Humger timer
-            this.HUNGERDW = sync.register(new Data_Int(), new Integer(0));
+            this.HUNGERDW = sync.register(new Data_Int(), Integer.valueOf(0));
             // // for sheared status
             this.NICKNAMEDW = sync.register(new Data_String(), "");// nickname
-            this.HAPPYDW = sync.register(new Data_Int(), new Integer(0));// Happiness
+            this.HAPPYDW = sync.register(new Data_Int(), Integer.valueOf(0));// Happiness
             this.TYPE1DW = sync.register(new Data_String(), "");// overriden
             // type1
             this.TYPE2DW = sync.register(new Data_String(), "");// overriden
@@ -100,7 +100,7 @@ public void register(final IPokemob pokemob)
             this.COMBATSTATESDW = sync.register(new Data_Int(), Integer.valueOf(0));
 
             // from EntityEvolvablePokemob
-            this.EVOLTICKDW = sync.register(new Data_Int(), new Integer(0));// evolution
+            this.EVOLTICKDW = sync.register(new Data_Int(), Integer.valueOf(0));// evolution
             this.DYNAPOWERDW = sync.register(new Data_Float(), Float.valueOf(1));
             // tick
 
diff --git a/src/main/java/pokecube/core/interfaces/capabilities/impl/PokemobEvolves.java b/src/main/java/pokecube/core/interfaces/capabilities/impl/PokemobEvolves.java
index 61df473424..f7293660b4 100644
--- a/src/main/java/pokecube/core/interfaces/capabilities/impl/PokemobEvolves.java
+++ b/src/main/java/pokecube/core/interfaces/capabilities/impl/PokemobEvolves.java
@@ -31,7 +31,7 @@ public void setEvolutionStack(final ItemStack stack)
     @Override
     public void setEvolutionTicks(final int evolutionTicks)
     {
-        this.dataSync().set(this.params.EVOLTICKDW, new Integer(evolutionTicks));
+        this.dataSync().set(this.params.EVOLTICKDW, Integer.valueOf(evolutionTicks));
     }
 
     @Override
@@ -45,6 +45,6 @@ public void setDynamaxFactor(float factor)
     {
         // Cap this so it is at least 1.
         factor = Math.max(1, factor);
-        this.dataSync().set(this.params.DYNAPOWERDW, new Float(factor));
+        this.dataSync().set(this.params.DYNAPOWERDW, Float.valueOf(factor));
     }
 }
diff --git a/src/main/java/thut/core/common/genetics/genes/GeneFloat.java b/src/main/java/thut/core/common/genetics/genes/GeneFloat.java
index ab81365962..c939fa207e 100644
--- a/src/main/java/thut/core/common/genetics/genes/GeneFloat.java
+++ b/src/main/java/thut/core/common/genetics/genes/GeneFloat.java
@@ -5,7 +5,7 @@
 
 public abstract class GeneFloat implements Gene<Float>
 {
-    protected Float value = new Float(0);
+    protected Float value = Float.valueOf(0);
 
     @Override
     public Float getValue()
diff --git a/src/main/java/thut/core/common/genetics/genes/GeneInteger.java b/src/main/java/thut/core/common/genetics/genes/GeneInteger.java
index 9010ed3df3..1db146d7d4 100644
--- a/src/main/java/thut/core/common/genetics/genes/GeneInteger.java
+++ b/src/main/java/thut/core/common/genetics/genes/GeneInteger.java
@@ -5,7 +5,7 @@
 
 public abstract class GeneInteger implements Gene<Integer>
 {
-    protected Integer value = new Integer(0);
+    protected Integer value = Integer.valueOf(0);
 
     @Override
     public Integer getValue()