diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/PhysicalPropertyMethod.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/PhysicalPropertyMethod.java
index 6b4cb13f6..c742e51cc 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/PhysicalPropertyMethod.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/PhysicalPropertyMethod.java
@@ -11,13 +11,13 @@
 
 /**
  * <p>
- * PhysicalPropertyMethod class.
+ * Abstract PhysicalPropertyMethod class.
  * </p>
  *
  * @author esol
  * @version $Id: $Id
  */
-public class PhysicalPropertyMethod implements PhysicalPropertyMethodInterface {
+public abstract class PhysicalPropertyMethod implements PhysicalPropertyMethodInterface {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(PhysicalPropertyMethod.class);
 
@@ -42,15 +42,9 @@ public PhysicalPropertyMethod clone() {
     return properties;
   }
 
-  /** {@inheritDoc} */
-  @Override
-  public void setPhase(
-      neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) {}
-
   /** {@inheritDoc} */
   @Override
   public void tuneModel(double val, double temperature, double pressure) {
     throw new UnsupportedOperationException("Unimplemented method 'tuneModel'");
   }
-  // should contain phase objects ++ get diffusivity methods .. more ?
 }
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/CommonPhysicalPropertyMethod.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/CommonPhysicalPropertyMethod.java
index 69af7433f..1f3b13327 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/CommonPhysicalPropertyMethod.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/CommonPhysicalPropertyMethod.java
@@ -1,5 +1,7 @@
 package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties;
 
+import neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethod;
+
 /**
  * <p>
  * CommonPhysicalPropertyMethod class.
@@ -8,8 +10,7 @@
  * @author Even Solbraa
  * @version $Id: $Id
  */
-public class CommonPhysicalPropertyMethod
-    extends neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethod {
+public class CommonPhysicalPropertyMethod extends PhysicalPropertyMethod {
   private static final long serialVersionUID = 1000;
 
   protected neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase;
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/conductivity/Conductivity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/conductivity/Conductivity.java
index 64679d1e8..bec0e0394 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/conductivity/Conductivity.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/conductivity/Conductivity.java
@@ -2,16 +2,15 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.CommonPhysicalPropertyMethod;
+import neqsim.physicalproperties.physicalpropertymethods.methodinterface.ConductivityInterface;
 
 /**
  * Class for physical property Conductivity.
  *
  * @author Even Solbraa
  */
-abstract class Conductivity extends
-    neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.CommonPhysicalPropertyMethod
-    implements
-    neqsim.physicalproperties.physicalpropertymethods.methodinterface.ConductivityInterface {
+abstract class Conductivity extends CommonPhysicalPropertyMethod implements ConductivityInterface {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(Conductivity.class);
 
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/diffusivity/Diffusivity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/diffusivity/Diffusivity.java
index f8a608e5b..436b3713a 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/diffusivity/Diffusivity.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/diffusivity/Diffusivity.java
@@ -3,6 +3,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.CommonPhysicalPropertyMethod;
+import neqsim.physicalproperties.physicalpropertymethods.methodinterface.DiffusivityInterface;
 
 /**
  * <p>
@@ -12,8 +13,7 @@
  * @author Even Solbraa
  * @version $Id: $Id
  */
-public class Diffusivity extends CommonPhysicalPropertyMethod implements
-    neqsim.physicalproperties.physicalpropertymethods.methodinterface.DiffusivityInterface {
+public class Diffusivity extends CommonPhysicalPropertyMethod implements DiffusivityInterface {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(Diffusivity.class);
 
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/Viscosity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/Viscosity.java
index b7ea0f9f7..f064cb04b 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/Viscosity.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/Viscosity.java
@@ -2,16 +2,15 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.CommonPhysicalPropertyMethod;
+import neqsim.physicalproperties.physicalpropertymethods.methodinterface.ViscosityInterface;
 
 /**
  * Abstract class for Viscosity property.
  *
  * @author Even Solbraa
  */
-abstract class Viscosity extends
-    neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.CommonPhysicalPropertyMethod
-    implements
-    neqsim.physicalproperties.physicalpropertymethods.methodinterface.ViscosityInterface {
+abstract class Viscosity extends CommonPhysicalPropertyMethod implements ViscosityInterface {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(Viscosity.class);
 
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/GasPhysicalPropertyMethod.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/GasPhysicalPropertyMethod.java
index 5316ee964..dea072c75 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/GasPhysicalPropertyMethod.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/GasPhysicalPropertyMethod.java
@@ -1,5 +1,7 @@
 package neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties;
 
+import neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethod;
+
 /**
  * <p>
  * GasPhysicalPropertyMethod class.
@@ -8,8 +10,7 @@
  * @author Even Solbraa
  * @version $Id: $Id
  */
-public class GasPhysicalPropertyMethod
-    extends neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethod {
+public abstract class GasPhysicalPropertyMethod extends PhysicalPropertyMethod {
   private static final long serialVersionUID = 1000;
 
   protected neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface gasPhase;
@@ -22,8 +23,7 @@ public class GasPhysicalPropertyMethod
    * Constructor for GasPhysicalPropertyMethod.
    * </p>
    */
-  public GasPhysicalPropertyMethod() {
-  }
+  public GasPhysicalPropertyMethod() {}
 
   /**
    * <p>
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/conductivity/Conductivity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/conductivity/Conductivity.java
index fdb085571..57a70b541 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/conductivity/Conductivity.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/conductivity/Conductivity.java
@@ -8,16 +8,16 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.GasPhysicalPropertyMethod;
+import neqsim.physicalproperties.physicalpropertymethods.methodinterface.ConductivityInterface;
 
 /**
  * Abstract class Conductivity.
  *
  * @author Even Solbraa
  */
-abstract class Conductivity extends
-    neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.GasPhysicalPropertyMethod
-    implements
-    neqsim.physicalproperties.physicalpropertymethods.methodinterface.ConductivityInterface {
+public abstract class Conductivity extends GasPhysicalPropertyMethod
+    implements ConductivityInterface {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(Conductivity.class);
 
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/density/Density.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/density/Density.java
index e87bad69a..20f43afb4 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/density/Density.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/density/Density.java
@@ -9,6 +9,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.GasPhysicalPropertyMethod;
+import neqsim.physicalproperties.physicalpropertymethods.methodinterface.DensityInterface;
 
 /**
  * <p>
@@ -18,8 +19,7 @@
  * @author Even Solbraa
  * @version $Id: $Id
  */
-public class Density extends GasPhysicalPropertyMethod
-    implements neqsim.physicalproperties.physicalpropertymethods.methodinterface.DensityInterface {
+public class Density extends GasPhysicalPropertyMethod implements DensityInterface {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(Density.class);
 
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/diffusivity/Diffusivity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/diffusivity/Diffusivity.java
index a135d33cb..cdc8d2290 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/diffusivity/Diffusivity.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/diffusivity/Diffusivity.java
@@ -2,6 +2,8 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.GasPhysicalPropertyMethod;
+import neqsim.physicalproperties.physicalpropertymethods.methodinterface.DiffusivityInterface;
 
 /**
  * <p>
@@ -11,10 +13,7 @@
  * @author Even Solbraa
  * @version $Id: $Id
  */
-public class Diffusivity extends
-    neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.GasPhysicalPropertyMethod
-    implements
-    neqsim.physicalproperties.physicalpropertymethods.methodinterface.DiffusivityInterface {
+public class Diffusivity extends GasPhysicalPropertyMethod implements DiffusivityInterface {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(Diffusivity.class);
 
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/diffusivity/WilkeLeeDiffusivity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/diffusivity/WilkeLeeDiffusivity.java
index 60241b0d8..8a9443fa1 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/diffusivity/WilkeLeeDiffusivity.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/diffusivity/WilkeLeeDiffusivity.java
@@ -11,7 +11,9 @@
 public class WilkeLeeDiffusivity extends Diffusivity {
   private static final long serialVersionUID = 1000;
 
-  double[][] binaryDiffusionCoefficients, binaryLennardJonesOmega;
+  double[][] binaryDiffusionCoefficients;
+
+  double[][] binaryLennardJonesOmega;
 
   /**
    * <p>
@@ -38,8 +40,14 @@ public double calcBinaryDiffusionCoefficient(int i, int j, int method) {
     // if(method==? then)
     // remember this is the Fick's diffusion coefficients
     // to get the Maxwell-Stefan coefficient - multiply by gamma
-    double A2 = 1.06036, B2 = 0.15610, C2 = 0.19300, D2 = 0.47635, E2 = 1.03587, F2 = 1.52996,
-        G2 = 1.76474, H2 = 3.89411;
+    double A2 = 1.06036;
+    double B2 = 0.15610;
+    double C2 = 0.19300;
+    double D2 = 0.47635;
+    double E2 = 1.03587;
+    double F2 = 1.52996;
+    double G2 = 1.76474;
+    double H2 = 3.89411;
     double tempVar2 = gasPhase.getPhase().getTemperature() / binaryEnergyParameter[i][j];
     binaryLennardJonesOmega[i][j] = A2 / Math.pow(tempVar2, B2) + C2 / Math.exp(D2 * tempVar2)
         + E2 / Math.exp(F2 * tempVar2) + G2 / Math.exp(H2 * tempVar2);
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/viscosity/Viscosity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/viscosity/Viscosity.java
index 2cd72f0a9..24ca65cc9 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/viscosity/Viscosity.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/viscosity/Viscosity.java
@@ -2,16 +2,15 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.GasPhysicalPropertyMethod;
+import neqsim.physicalproperties.physicalpropertymethods.methodinterface.ViscosityInterface;
 
 /**
  * * Abstract class for Viscosity property.
  *
  * @author Even Solbraa
  */
-abstract class Viscosity extends
-    neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.GasPhysicalPropertyMethod
-    implements
-    neqsim.physicalproperties.physicalpropertymethods.methodinterface.ViscosityInterface {
+abstract class Viscosity extends GasPhysicalPropertyMethod implements ViscosityInterface {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(Viscosity.class);
 
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/LiquidPhysicalPropertyMethod.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/LiquidPhysicalPropertyMethod.java
index a88f6ef62..b4e584b31 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/LiquidPhysicalPropertyMethod.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/LiquidPhysicalPropertyMethod.java
@@ -1,5 +1,7 @@
 package neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties;
 
+import neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethod;
+
 /**
  * <p>
  * LiquidPhysicalPropertyMethod class.
@@ -8,8 +10,7 @@
  * @author Even Solbraa
  * @version $Id: $Id
  */
-public class LiquidPhysicalPropertyMethod
-    extends neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethod {
+public class LiquidPhysicalPropertyMethod extends PhysicalPropertyMethod {
   private static final long serialVersionUID = 1000;
 
   protected neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface liquidPhase;
@@ -19,8 +20,7 @@ public class LiquidPhysicalPropertyMethod
    * Constructor for LiquidPhysicalPropertyMethod.
    * </p>
    */
-  public LiquidPhysicalPropertyMethod() {
-  }
+  public LiquidPhysicalPropertyMethod() {}
 
   /**
    * <p>
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/conductivity/Conductivity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/conductivity/Conductivity.java
index 5bbc006f3..573b2d6f0 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/conductivity/Conductivity.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/conductivity/Conductivity.java
@@ -8,6 +8,8 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.LiquidPhysicalPropertyMethod;
+import neqsim.physicalproperties.physicalpropertymethods.methodinterface.ConductivityInterface;
 
 /**
  * <p>
@@ -17,10 +19,7 @@
  * @author Even Solbraa
  * @version $Id: $Id
  */
-public class Conductivity extends
-    neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.LiquidPhysicalPropertyMethod
-    implements
-    neqsim.physicalproperties.physicalpropertymethods.methodinterface.ConductivityInterface {
+public class Conductivity extends LiquidPhysicalPropertyMethod implements ConductivityInterface {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(Conductivity.class);
 
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/Costald.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/Costald.java
index 697a191e3..cc177f1fc 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/Costald.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/Costald.java
@@ -8,6 +8,8 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.LiquidPhysicalPropertyMethod;
+import neqsim.physicalproperties.physicalpropertymethods.methodinterface.DensityInterface;
 
 /**
  * <p>
@@ -17,9 +19,7 @@
  * @author Even Solbraa
  * @version $Id: $Id
  */
-public class Costald extends
-    neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.LiquidPhysicalPropertyMethod
-    implements neqsim.physicalproperties.physicalpropertymethods.methodinterface.DensityInterface {
+public class Costald extends LiquidPhysicalPropertyMethod implements DensityInterface {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(Density.class);
 
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/Density.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/Density.java
index e55dc70cd..187e2944b 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/Density.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/Density.java
@@ -8,6 +8,8 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.LiquidPhysicalPropertyMethod;
+import neqsim.physicalproperties.physicalpropertymethods.methodinterface.DensityInterface;
 
 /**
  * <p>
@@ -17,9 +19,7 @@
  * @author Even Solbraa
  * @version $Id: $Id
  */
-public class Density extends
-    neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.LiquidPhysicalPropertyMethod
-    implements neqsim.physicalproperties.physicalpropertymethods.methodinterface.DensityInterface {
+public class Density extends LiquidPhysicalPropertyMethod implements DensityInterface {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(Density.class);
 
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/Diffusivity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/Diffusivity.java
index 562aca93b..11cd343cb 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/Diffusivity.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/Diffusivity.java
@@ -2,16 +2,15 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.LiquidPhysicalPropertyMethod;
+import neqsim.physicalproperties.physicalpropertymethods.methodinterface.DiffusivityInterface;
 
 /**
  * Diffusivity class.
  *
  * @author Even Solbraa
  */
-abstract class Diffusivity extends
-    neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.LiquidPhysicalPropertyMethod
-    implements
-    neqsim.physicalproperties.physicalpropertymethods.methodinterface.DiffusivityInterface {
+abstract class Diffusivity extends LiquidPhysicalPropertyMethod implements DiffusivityInterface {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(Diffusivity.class);
 
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/viscosity/Viscosity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/viscosity/Viscosity.java
index 126292207..1eb58881d 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/viscosity/Viscosity.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/viscosity/Viscosity.java
@@ -2,6 +2,8 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.LiquidPhysicalPropertyMethod;
+import neqsim.physicalproperties.physicalpropertymethods.methodinterface.ViscosityInterface;
 
 /**
  * <p>
@@ -11,10 +13,7 @@
  * @author Even Solbraa
  * @version Method was checked on 2.8.2001 - seems to be correct - Even Solbraa
  */
-public class Viscosity extends
-    neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.LiquidPhysicalPropertyMethod
-    implements
-    neqsim.physicalproperties.physicalpropertymethods.methodinterface.ViscosityInterface {
+public class Viscosity extends LiquidPhysicalPropertyMethod implements ViscosityInterface {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(Viscosity.class);
 
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/ConductivityInterface.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/ConductivityInterface.java
index d12f47a9b..4355a512c 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/ConductivityInterface.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/ConductivityInterface.java
@@ -1,5 +1,6 @@
 package neqsim.physicalproperties.physicalpropertymethods.methodinterface;
 
+import neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethodInterface;
 import neqsim.thermo.ThermodynamicConstantsInterface;
 
 /**
@@ -10,8 +11,8 @@
  * @author Even Solbraa
  * @version $Id: $Id
  */
-public interface ConductivityInterface extends ThermodynamicConstantsInterface,
-    neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethodInterface {
+public interface ConductivityInterface
+    extends ThermodynamicConstantsInterface, PhysicalPropertyMethodInterface {
   /**
    * <p>
    * calcConductivity.
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/DensityInterface.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/DensityInterface.java
index dd4371524..365487722 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/DensityInterface.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/DensityInterface.java
@@ -1,5 +1,6 @@
 package neqsim.physicalproperties.physicalpropertymethods.methodinterface;
 
+import neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethodInterface;
 import neqsim.thermo.ThermodynamicConstantsInterface;
 
 /**
@@ -10,8 +11,8 @@
  * @author Even Solbraa
  * @version $Id: $Id
  */
-public interface DensityInterface extends ThermodynamicConstantsInterface,
-    neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethodInterface {
+public interface DensityInterface
+    extends ThermodynamicConstantsInterface, PhysicalPropertyMethodInterface {
   /**
    * <p>
    * Returns the density of the phase. Unit: kg/m^3
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/DiffusivityInterface.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/DiffusivityInterface.java
index 93bfb870c..bb7ae9f1e 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/DiffusivityInterface.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/DiffusivityInterface.java
@@ -1,5 +1,6 @@
 package neqsim.physicalproperties.physicalpropertymethods.methodinterface;
 
+import neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethodInterface;
 import neqsim.thermo.ThermodynamicConstantsInterface;
 
 /**
@@ -10,8 +11,8 @@
  * @author Even Solbraa
  * @version $Id: $Id
  */
-public interface DiffusivityInterface extends ThermodynamicConstantsInterface,
-    neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethodInterface {
+public interface DiffusivityInterface
+    extends ThermodynamicConstantsInterface, PhysicalPropertyMethodInterface {
   /**
    * <p>
    * calcBinaryDiffusionCoefficient.
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/ViscosityInterface.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/ViscosityInterface.java
index 9a55211e5..9d34b4843 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/ViscosityInterface.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/ViscosityInterface.java
@@ -1,5 +1,7 @@
 package neqsim.physicalproperties.physicalpropertymethods.methodinterface;
 
+import neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethodInterface;
+
 /**
  * <p>
  * ViscosityInterface interface.
@@ -8,8 +10,7 @@
  * @author Even Solbraa
  * @version $Id: $Id
  */
-public interface ViscosityInterface
-    extends neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethodInterface {
+public interface ViscosityInterface extends PhysicalPropertyMethodInterface {
   /**
    * <p>
    * calcViscosity.
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/SolidPhysicalPropertyMethod.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/SolidPhysicalPropertyMethod.java
index 715439dd7..79c02f261 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/SolidPhysicalPropertyMethod.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/SolidPhysicalPropertyMethod.java
@@ -1,5 +1,7 @@
 package neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties;
 
+import neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethod;
+
 /**
  * <p>
  * SolidPhysicalPropertyMethod class.
@@ -8,20 +10,11 @@
  * @author Even Solbraa
  * @version $Id: $Id
  */
-public class SolidPhysicalPropertyMethod
-    extends neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethod {
+public class SolidPhysicalPropertyMethod extends PhysicalPropertyMethod {
   private static final long serialVersionUID = 1000;
 
   protected neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface solidPhase;
 
-  /**
-   * <p>
-   * Constructor for SolidPhysicalPropertyMethod.
-   * </p>
-   */
-  public SolidPhysicalPropertyMethod() {
-  }
-
   /**
    * <p>
    * Constructor for SolidPhysicalPropertyMethod.
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/conductivity/Conductivity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/conductivity/Conductivity.java
index c6ffade17..38c1ada1c 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/conductivity/Conductivity.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/conductivity/Conductivity.java
@@ -8,6 +8,8 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import neqsim.physicalproperties.physicalpropertymethods.methodinterface.ConductivityInterface;
+import neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.SolidPhysicalPropertyMethod;
 import neqsim.thermo.phase.PhaseType;
 
 /**
@@ -18,10 +20,7 @@
  * @author Even Solbraa
  * @version $Id: $Id
  */
-public class Conductivity extends
-    neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.SolidPhysicalPropertyMethod
-    implements
-    neqsim.physicalproperties.physicalpropertymethods.methodinterface.ConductivityInterface {
+public class Conductivity extends SolidPhysicalPropertyMethod implements ConductivityInterface {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(Conductivity.class);
 
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/density/Density.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/density/Density.java
index ce179d591..c7dcca12c 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/density/Density.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/density/Density.java
@@ -8,6 +8,8 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import neqsim.physicalproperties.physicalpropertymethods.methodinterface.DensityInterface;
+import neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.SolidPhysicalPropertyMethod;
 
 /**
  * <p>
@@ -17,9 +19,7 @@
  * @author Even Solbraa
  * @version $Id: $Id
  */
-public class Density extends
-    neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.SolidPhysicalPropertyMethod
-    implements neqsim.physicalproperties.physicalpropertymethods.methodinterface.DensityInterface {
+public class Density extends SolidPhysicalPropertyMethod implements DensityInterface {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(Density.class);
 
@@ -28,13 +28,13 @@ public class Density extends
    * Constructor for Density.
    * </p>
    *
-   * @param liquidPhase a
+   * @param phase a
    *        {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface}
    *        object
    */
   public Density(
-      neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface liquidPhase) {
-    this.solidPhase = liquidPhase;
+      neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) {
+    super(phase);
   }
 
   /** {@inheritDoc} */
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/diffusivity/Diffusivity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/diffusivity/Diffusivity.java
index 565209048..3ff37622f 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/diffusivity/Diffusivity.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/diffusivity/Diffusivity.java
@@ -2,6 +2,8 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import neqsim.physicalproperties.physicalpropertymethods.methodinterface.DiffusivityInterface;
+import neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.SolidPhysicalPropertyMethod;
 
 /**
  * <p>
@@ -11,10 +13,7 @@
  * @author Even Solbraa
  * @version $Id: $Id
  */
-public class Diffusivity extends
-    neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.SolidPhysicalPropertyMethod
-    implements
-    neqsim.physicalproperties.physicalpropertymethods.methodinterface.DiffusivityInterface {
+public class Diffusivity extends SolidPhysicalPropertyMethod implements DiffusivityInterface {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(Diffusivity.class);
 
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/viscosity/Viscosity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/viscosity/Viscosity.java
index fa76ffcdf..120a4991e 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/viscosity/Viscosity.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/viscosity/Viscosity.java
@@ -3,6 +3,8 @@
 import static java.lang.Double.NaN;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import neqsim.physicalproperties.physicalpropertymethods.methodinterface.ViscosityInterface;
+import neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.SolidPhysicalPropertyMethod;
 
 /**
  * <p>
@@ -12,10 +14,7 @@
  * @author Even Solbraa
  * @version Method was checked on 2.8.2001 - seems to be correct - Even Solbraa
  */
-public class Viscosity extends
-    neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.SolidPhysicalPropertyMethod
-    implements
-    neqsim.physicalproperties.physicalpropertymethods.methodinterface.ViscosityInterface {
+public class Viscosity extends SolidPhysicalPropertyMethod implements ViscosityInterface {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(Viscosity.class);
 
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/gasphysicalproperties/GasPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/gasphysicalproperties/GasPhysicalProperties.java
index 3c11c11ed..a9f8d7871 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/gasphysicalproperties/GasPhysicalProperties.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/gasphysicalproperties/GasPhysicalProperties.java
@@ -10,6 +10,7 @@
 import org.apache.logging.log4j.Logger;
 import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.conductivity.PFCTConductivityMethodMod86;
 import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity.PFCTViscosityMethodHeavyOil;
+import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
 import neqsim.thermo.phase.PhaseInterface;
 
 /**
@@ -20,8 +21,7 @@
  * @author Even Solbraa
  * @version $Id: $Id
  */
-public class GasPhysicalProperties
-    extends neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties {
+public class GasPhysicalProperties extends PhysicalProperties {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(GasPhysicalProperties.class);
 
@@ -52,7 +52,6 @@ public GasPhysicalProperties(PhaseInterface phase, int binaryDiffusionCoefficien
     densityCalc =
         new neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.density.Density(
             this);
-    // this.init(phase);
   }
 
   /** {@inheritDoc} */
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/CO2waterPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/CO2waterPhysicalProperties.java
index d2c30b008..60a8e1393 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/CO2waterPhysicalProperties.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/CO2waterPhysicalProperties.java
@@ -6,6 +6,7 @@
 import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.density.Density;
 import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity.CO2water;
 import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.viscosity.Viscosity;
+import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
 import neqsim.thermo.phase.PhaseInterface;
 
 /**
@@ -16,8 +17,7 @@
  * @author Even Solbraa
  * @version $Id: $Id
  */
-public class CO2waterPhysicalProperties
-    extends neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties {
+public class CO2waterPhysicalProperties extends PhysicalProperties {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(CO2waterPhysicalProperties.class);
 
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/LiquidPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/LiquidPhysicalProperties.java
index 9dc8a2041..90d401f61 100644
--- a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/LiquidPhysicalProperties.java
+++ b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/LiquidPhysicalProperties.java
@@ -12,6 +12,7 @@
 import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity.PFCTViscosityMethodHeavyOil;
 import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.density.Density;
 import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity.SiddiqiLucasMethod;
+import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
 import neqsim.thermo.phase.PhaseInterface;
 
 /**
@@ -22,8 +23,7 @@
  * @author Even Solbraa
  * @version $Id: $Id
  */
-public class LiquidPhysicalProperties
-    extends neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties {
+public class LiquidPhysicalProperties extends PhysicalProperties {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(LiquidPhysicalProperties.class);