From e5940b599df9eb624f00c6ea54374a3c2637f30d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=85smund=20V=C3=A5ge=20Fannemel?=
 <34712686+asmfstatoil@users.noreply.github.com>
Date: Wed, 16 Oct 2024 09:52:56 +0200
Subject: [PATCH] chore: remove unused imports and format

---
 .../InterphasePackedBed.java                  | 17 +++---
 .../InterphaseReactorFlow.java                |  3 +-
 .../TwoPhasePackedBedFlowNode.java            | 43 ++++++++-------
 .../chungmethod/TestChungFit.java             |  6 +-
 .../linearliquidmodel/TestViscosityFit.java   |  6 +-
 .../linearliquidmodel/ViscosityFunction.java  |  3 +-
 .../absorber/AbsorberMechanicalDesign.java    | 20 ++++---
 .../GasScrubberMechanicalDesign.java          | 27 ++++-----
 .../separator/SeparatorMechanicalDesign.java  | 37 ++++++-------
 .../sectiontype/DistillationTraySection.java  |  4 +-
 .../compressor/CompressorChart.java           | 16 ++++--
 .../separator/NeqGasScrubber.java             | 10 ++--
 .../processequipment/separator/Separator.java | 55 ++++++++-----------
 .../separator/sectiontype/ValveSection.java   |  4 +-
 .../pvtsimulation/simulation/DensitySim.java  | 20 ++++---
 .../simulation/ViscositySim.java              | 20 ++++---
 .../simulation/ViscosityWaxOilSim.java        | 25 +++++----
 .../shipsystem/LNGshipTest.java               |  1 -
 .../packings/PallRingPackingTest.java         |  1 -
 .../packings/RachigRingPackingTest.java       |  1 -
 .../simpleflowregime/SevereSlugTest.java      |  1 -
 .../SystemMechanicalDesignTest.java           |  1 -
 .../compressor/CompressorCalculationTest.java |  1 -
 .../compressor/CompressorChartTest.java       |  2 -
 .../distillation/DistillationColumnTest.java  |  4 +-
 .../heatexchanger/HeatExchangerTest.java      |  1 -
 .../heatexchanger/HeaterTest.java             |  1 -
 .../manifold/ManifoldTest.java                |  1 -
 .../processequipment/mixer/MixerTest.java     |  1 -
 .../pipeline/AdiabaticTwoPhasePipeTest.java   |  1 -
 .../pipeline/BeggsAndBrillsPipeTest.java      |  1 -
 .../pipeline/PipelineTest.java                |  3 -
 .../processequipment/pump/PumpChartTest.java  |  1 -
 .../processequipment/pump/PumpTest.java       |  1 -
 .../separator/SeparatorTest.java              |  1 -
 .../splitter/ComponentSplitterTest.java       |  2 -
 .../processequipment/stream/StreamTest.java   |  1 -
 .../stream/VirtualStreamTest.java             |  2 -
 .../processequipment/util/FlowSetterTest.java |  1 -
 .../processequipment/util/GORfitterTest.java  |  1 -
 .../processequipment/util/MPFMfitterTest.java |  1 -
 .../util/PressureDropTest.java                |  1 -
 .../util/StreamSaturatorUtilTest.java         |  1 -
 .../valve/ThrottlingValveTest.java            |  1 -
 .../processsystem/GlycolRigTest.java          |  1 -
 .../processsystem/OilProcessTest.java         |  1 -
 .../gasquality/Draft_GERG2004Test.java        | 29 +++++-----
 .../ThermodynamicOperationsTest.java          |  1 -
 48 files changed, 174 insertions(+), 209 deletions(-)

diff --git a/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasereactorflow/InterphasePackedBed.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasereactorflow/InterphasePackedBed.java
index 7682603588..7dc5849089 100644
--- a/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasereactorflow/InterphasePackedBed.java
+++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasereactorflow/InterphasePackedBed.java
@@ -19,8 +19,7 @@ public class InterphasePackedBed extends InterphaseReactorFlow
    * Constructor for InterphasePackedBed.
    * </p>
    */
-  public InterphasePackedBed() {
-  }
+  public InterphasePackedBed() {}
 
   /**
    * <p>
@@ -78,9 +77,10 @@ public double calcInterphaseMassTransferCoefficient(int phase, double schmidtNum
     double massTrans = 0;
     if (phase == 1) {
       // massTrans = 0.0002;
-      redMassTrans = 0.0051 * Math.pow(node.getReynoldsNumber(phase), 0.67) * Math.pow(schmidtNumber, -0.5)
-          * Math.pow(node.getGeometry().getPacking().getSurfaceAreaPrVolume()
-              * node.getGeometry().getPacking().getSize(), 0.4);
+      redMassTrans =
+          0.0051 * Math.pow(node.getReynoldsNumber(phase), 0.67) * Math.pow(schmidtNumber, -0.5)
+              * Math.pow(node.getGeometry().getPacking().getSurfaceAreaPrVolume()
+                  * node.getGeometry().getPacking().getSize(), 0.4);
       massTrans = redMassTrans * Math.pow(
           node.getBulkSystem().getPhases()[phase].getPhysicalProperties().getKinematicViscosity()
               * gravity,
@@ -88,9 +88,10 @@ public double calcInterphaseMassTransferCoefficient(int phase, double schmidtNum
       System.out.println("mas trans liq " + massTrans);
     }
     if (phase == 0) {
-      redMassTrans = 3.6 * Math.pow(node.getReynoldsNumber(phase), 0.7) * Math.pow(schmidtNumber, 0.33)
-          * Math.pow(node.getGeometry().getPacking().getSurfaceAreaPrVolume()
-              * node.getGeometry().getPacking().getSize(), -2.0);
+      redMassTrans =
+          3.6 * Math.pow(node.getReynoldsNumber(phase), 0.7) * Math.pow(schmidtNumber, 0.33)
+              * Math.pow(node.getGeometry().getPacking().getSurfaceAreaPrVolume()
+                  * node.getGeometry().getPacking().getSize(), -2.0);
       massTrans = redMassTrans * node.getGeometry().getPacking().getSurfaceAreaPrVolume()
           * node.getBulkSystem().getPhases()[phase].getPhysicalProperties().getKinematicViscosity()
           / schmidtNumber;
diff --git a/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasereactorflow/InterphaseReactorFlow.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasereactorflow/InterphaseReactorFlow.java
index b7c59f5820..00038ff0dd 100644
--- a/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasereactorflow/InterphaseReactorFlow.java
+++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasereactorflow/InterphaseReactorFlow.java
@@ -17,8 +17,7 @@ public class InterphaseReactorFlow extends InterphaseTwoPhase {
    * Constructor for InterphaseReactorFlow.
    * </p>
    */
-  public InterphaseReactorFlow() {
-  }
+  public InterphaseReactorFlow() {}
 
   /**
    * <p>
diff --git a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhasePackedBedFlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhasePackedBedFlowNode.java
index f8c5a86dab..1f54a3f186 100644
--- a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhasePackedBedFlowNode.java
+++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhasePackedBedFlowNode.java
@@ -35,16 +35,16 @@ public TwoPhasePackedBedFlowNode() {
    * </p>
    *
    * @param system a {@link neqsim.thermo.system.SystemInterface} object
-   * @param pipe   a
-   *               {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface}
-   *               object
+   * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface}
+   *        object
    */
   public TwoPhasePackedBedFlowNode(SystemInterface system, GeometryDefinitionInterface pipe) {
     super(system, pipe);
     this.flowNodeType = "packed bed";
     this.interphaseTransportCoefficient = new InterphasePackedBed(this);
-    this.fluidBoundary = new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel(
-        this);
+    this.fluidBoundary =
+        new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel(
+            this);
   }
 
   /**
@@ -52,19 +52,19 @@ public TwoPhasePackedBedFlowNode(SystemInterface system, GeometryDefinitionInter
    * Constructor for TwoPhasePackedBedFlowNode.
    * </p>
    *
-   * @param system           a {@link neqsim.thermo.system.SystemInterface} object
+   * @param system a {@link neqsim.thermo.system.SystemInterface} object
    * @param interphaseSystem a {@link neqsim.thermo.system.SystemInterface} object
-   * @param pipe             a
-   *                         {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface}
-   *                         object
+   * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface}
+   *        object
    */
   public TwoPhasePackedBedFlowNode(SystemInterface system, SystemInterface interphaseSystem,
       GeometryDefinitionInterface pipe) {
     super(system, pipe);
     this.flowNodeType = "packed bed";
     this.interphaseTransportCoefficient = new InterphasePackedBed(this);
-    this.fluidBoundary = new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel(
-        this);
+    this.fluidBoundary =
+        new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel(
+            this);
   }
 
   /** {@inheritDoc} */
@@ -106,12 +106,14 @@ public double calcHydraulicDiameter() {
   /** {@inheritDoc} */
   @Override
   public double calcReynoldNumber() {
-    reynoldsNumber[1] = getSuperficialVelocity(1) / getGeometry().getPacking().getSurfaceAreaPrVolume()
-        * bulkSystem.getPhases()[1].getPhysicalProperties().getDensity()
-        / bulkSystem.getPhases()[1].getPhysicalProperties().getViscosity();
-    reynoldsNumber[0] = getSuperficialVelocity(0) / getGeometry().getPacking().getSurfaceAreaPrVolume()
-        * bulkSystem.getPhases()[0].getPhysicalProperties().getDensity()
-        / bulkSystem.getPhases()[0].getPhysicalProperties().getViscosity();
+    reynoldsNumber[1] =
+        getSuperficialVelocity(1) / getGeometry().getPacking().getSurfaceAreaPrVolume()
+            * bulkSystem.getPhases()[1].getPhysicalProperties().getDensity()
+            / bulkSystem.getPhases()[1].getPhysicalProperties().getViscosity();
+    reynoldsNumber[0] =
+        getSuperficialVelocity(0) / getGeometry().getPacking().getSurfaceAreaPrVolume()
+            * bulkSystem.getPhases()[0].getPhysicalProperties().getDensity()
+            / bulkSystem.getPhases()[0].getPhysicalProperties().getViscosity();
     System.out.println("rey liq " + reynoldsNumber[1]);
     System.out.println("rey gas " + reynoldsNumber[0]);
     return reynoldsNumber[1];
@@ -120,7 +122,8 @@ public double calcReynoldNumber() {
   /** {@inheritDoc} */
   @Override
   public double calcContactLength() {
-    interphaseContactArea = pipe.getPacking().getSurfaceAreaPrVolume() * getLengthOfNode() * pipe.getArea();
+    interphaseContactArea =
+        pipe.getPacking().getSurfaceAreaPrVolume() * getLengthOfNode() * pipe.getArea();
     return wallContactLength[0];
   }
 
@@ -149,8 +152,8 @@ public void update() {
     for (int componentNumber = 0; componentNumber < getBulkSystem().getPhases()[0]
         .getNumberOfComponents(); componentNumber++) {
       if (componentNumber == 1) {
-        double liquidMolarRate = getFluidBoundary().getInterphaseMolarFlux(componentNumber)
-            * getInterphaseContactArea(); // getInterphaseContactLength(0)*getGeometry().getNodeLength();
+        double liquidMolarRate =
+            getFluidBoundary().getInterphaseMolarFlux(componentNumber) * getInterphaseContactArea(); // getInterphaseContactLength(0)*getGeometry().getNodeLength();
         double gasMolarRate = -getFluidBoundary().getInterphaseMolarFlux(componentNumber)
             * getInterphaseContactArea(); // getInterphaseContactLength(0)*getGeometry().getNodeLength();
         System.out.println("liquidMolarRate" + liquidMolarRate);
diff --git a/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/chungmethod/TestChungFit.java b/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/chungmethod/TestChungFit.java
index 8d1bc42b2f..8959346452 100644
--- a/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/chungmethod/TestChungFit.java
+++ b/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/chungmethod/TestChungFit.java
@@ -41,7 +41,7 @@ public static void main(String[] args) {
     ) {
       while (dataSet.next()) {
         ChungFunction function = new ChungFunction();
-        double guess[] = { 0.3211 };
+        double guess[] = {0.3211};
         function.setInitialGuess(guess);
 
         SystemInterface testSystem = new SystemSrkEos(280, 0.001);
@@ -50,8 +50,8 @@ public static void main(String[] args) {
         testSystem.createDatabase(true);
         testSystem.init(0);
         testSystem.setMixingRule(2);
-        double sample1[] = { Double.parseDouble(dataSet.getString("Temperature")) };
-        double standardDeviation1[] = { 0.1 };
+        double sample1[] = {Double.parseDouble(dataSet.getString("Temperature"))};
+        double standardDeviation1[] = {0.1};
         SampleValue sample = new SampleValue(Double.parseDouble(dataSet.getString("Viscosity")),
             0.001, sample1, standardDeviation1);
         sample.setFunction(function);
diff --git a/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/linearliquidmodel/TestViscosityFit.java b/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/linearliquidmodel/TestViscosityFit.java
index 3f53525de0..144a86bc0f 100644
--- a/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/linearliquidmodel/TestViscosityFit.java
+++ b/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/linearliquidmodel/TestViscosityFit.java
@@ -42,7 +42,7 @@ public static void main(String[] args) {
         ViscosityFunction function = new ViscosityFunction();
         // double guess[] = {-66.2, 11810, 0.1331, -0.0000983}; //mdea
         // double guess[] = {-5.771E1, 7.647E3, 1.442E-1, -1.357E-4}; //water
-        double guess[] = { -10.14, 3868.803, -0.00550507 }; // ,0.000001}; //,0.001}; //MEG
+        double guess[] = {-10.14, 3868.803, -0.00550507}; // ,0.000001}; //,0.001}; //MEG
         // double guess[] = { -53.92523097004079, 9741.992308,0,0.106066223998382};
         // //TEG
         function.setInitialGuess(guess);
@@ -55,8 +55,8 @@ public static void main(String[] args) {
         double temp = Double.parseDouble(dataSet.getString("Temperature"));
         testSystem.setTemperature(temp);
         testSystem.init(0);
-        double sample1[] = { temp };
-        double standardDeviation1[] = { 0.1 };
+        double sample1[] = {temp};
+        double standardDeviation1[] = {0.1};
         SampleValue sample = new SampleValue(Double.parseDouble(dataSet.getString("Viscosity")),
             Double.parseDouble(dataSet.getString("StdDev")), sample1, standardDeviation1);
         sample.setFunction(function);
diff --git a/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/linearliquidmodel/ViscosityFunction.java b/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/linearliquidmodel/ViscosityFunction.java
index 351ef48afa..024fcc2d23 100644
--- a/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/linearliquidmodel/ViscosityFunction.java
+++ b/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/linearliquidmodel/ViscosityFunction.java
@@ -22,8 +22,7 @@ public class ViscosityFunction extends LevenbergMarquardtFunction {
    * Constructor for ViscosityFunction.
    * </p>
    */
-  public ViscosityFunction() {
-  }
+  public ViscosityFunction() {}
 
   /** {@inheritDoc} */
   @Override
diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/absorber/AbsorberMechanicalDesign.java b/src/main/java/neqsim/processsimulation/mechanicaldesign/absorber/AbsorberMechanicalDesign.java
index b39f9ec53c..b2ec387684 100644
--- a/src/main/java/neqsim/processsimulation/mechanicaldesign/absorber/AbsorberMechanicalDesign.java
+++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/absorber/AbsorberMechanicalDesign.java
@@ -30,9 +30,8 @@ public class AbsorberMechanicalDesign extends SeparatorMechanicalDesign {
    * Constructor for AbsorberMechanicalDesign.
    * </p>
    *
-   * @param equipment a
-   *                  {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface}
-   *                  object
+   * @param equipment a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface}
+   *        object
    */
   public AbsorberMechanicalDesign(ProcessEquipmentInterface equipment) {
     super(equipment);
@@ -46,8 +45,9 @@ public void readDesignSpecifications() {
     if (getDesignStandard().containsKey("pressure vessel design code")) {
       System.out.println("pressure vessel code standard: "
           + getDesignStandard().get("pressure vessel design code").getStandardName());
-      wallThickness = ((PressureVesselDesignStandard) getDesignStandard().get("pressure vessel design code"))
-          .calcWallThickness();
+      wallThickness =
+          ((PressureVesselDesignStandard) getDesignStandard().get("pressure vessel design code"))
+              .calcWallThickness();
     } else {
       System.out.println("no pressure vessel code standard specified......");
       return;
@@ -65,10 +65,12 @@ public void readDesignSpecifications() {
     if (getDesignStandard().containsKey("separator process design")) {
       System.out.println("separator process design: "
           + getDesignStandard().get("separator process design").getStandardName());
-      gasLoadFactor = ((SeparatorDesignStandard) getDesignStandard().get("separator process design"))
-          .getGasLoadFactor();
-      volumeSafetyFactor = ((SeparatorDesignStandard) getDesignStandard().get("separator process design"))
-          .getVolumetricDesignFactor();
+      gasLoadFactor =
+          ((SeparatorDesignStandard) getDesignStandard().get("separator process design"))
+              .getGasLoadFactor();
+      volumeSafetyFactor =
+          ((SeparatorDesignStandard) getDesignStandard().get("separator process design"))
+              .getVolumetricDesignFactor();
     } else {
       System.out.println("no separator process design specified......");
     }
diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/GasScrubberMechanicalDesign.java b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/GasScrubberMechanicalDesign.java
index 1d9d242706..55fbd01756 100644
--- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/GasScrubberMechanicalDesign.java
+++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/GasScrubberMechanicalDesign.java
@@ -23,9 +23,8 @@ public class GasScrubberMechanicalDesign extends SeparatorMechanicalDesign {
    * Constructor for GasScrubberMechanicalDesign.
    * </p>
    *
-   * @param equipment a
-   *                  {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface}
-   *                  object
+   * @param equipment a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface}
+   *        object
    */
   public GasScrubberMechanicalDesign(ProcessEquipmentInterface equipment) {
     super(equipment);
@@ -39,10 +38,12 @@ public void readDesignSpecifications() {
     if (getDesignStandard().containsKey("gas scrubber process design")) {
       System.out.println("gas scrubber process design: "
           + getDesignStandard().get("gas scrubber process design").getStandardName());
-      gasLoadFactor = ((GasScrubberDesignStandard) getDesignStandard().get("gas scrubber process design"))
-          .getGasLoadFactor();
-      volumeSafetyFactor = ((GasScrubberDesignStandard) getDesignStandard().get("gas scrubber process design"))
-          .getVolumetricDesignFactor();
+      gasLoadFactor =
+          ((GasScrubberDesignStandard) getDesignStandard().get("gas scrubber process design"))
+              .getGasLoadFactor();
+      volumeSafetyFactor =
+          ((GasScrubberDesignStandard) getDesignStandard().get("gas scrubber process design"))
+              .getVolumetricDesignFactor();
     } else {
       System.out.println("no separator process design specified......");
     }
@@ -111,15 +112,11 @@ public void calcDesign() {
     moduleLength = tantanLength * 1.5;
     moduleHeight = innerDiameter * 2;
     /*
-     * System.out.println("wall thickness: " + separator.getName() + " " +
-     * getWallThickness() +
-     * " m"); System.out.println("separator dry weigth: " + emptyVesselWeight +
-     * " kg");
+     * System.out.println("wall thickness: " + separator.getName() + " " + getWallThickness() +
+     * " m"); System.out.println("separator dry weigth: " + emptyVesselWeight + " kg");
      * System.out.println("total skid weigth: " + totalSkidWeight + " kg");
-     * System.out.println("foot print: width:" + moduleWidth + " length " +
-     * moduleLength +
-     * " height " + moduleHeight + " meter.");
-     * System.out.println("mechanical price: " +
+     * System.out.println("foot print: width:" + moduleWidth + " length " + moduleLength +
+     * " height " + moduleHeight + " meter."); System.out.println("mechanical price: " +
      * materialsCost + " kNOK");
      */
     setWeigthVesselShell(emptyVesselWeight);
diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/SeparatorMechanicalDesign.java b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/SeparatorMechanicalDesign.java
index f300bc80d7..170b49e593 100644
--- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/SeparatorMechanicalDesign.java
+++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/SeparatorMechanicalDesign.java
@@ -35,9 +35,8 @@ public class SeparatorMechanicalDesign extends MechanicalDesign {
    * Constructor for SeparatorMechanicalDesign.
    * </p>
    *
-   * @param equipment a
-   *                  {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface}
-   *                  object
+   * @param equipment a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface}
+   *        object
    */
   public SeparatorMechanicalDesign(ProcessEquipmentInterface equipment) {
     super(equipment);
@@ -57,8 +56,9 @@ public void readDesignSpecifications() {
     if (getDesignStandard().containsKey("pressure vessel design code")) {
       System.out.println("pressure vessel code standard: "
           + getDesignStandard().get("pressure vessel design code").getStandardName());
-      wallThickness = ((PressureVesselDesignStandard) getDesignStandard().get("pressure vessel design code"))
-          .calcWallThickness();
+      wallThickness =
+          ((PressureVesselDesignStandard) getDesignStandard().get("pressure vessel design code"))
+              .calcWallThickness();
     } else {
       System.out.println("no pressure vessel code standard specified......");
     }
@@ -66,11 +66,13 @@ public void readDesignSpecifications() {
     if (getDesignStandard().containsKey("separator process design")) {
       System.out.println("separator process design: "
           + getDesignStandard().get("separator process design").getStandardName());
-      gasLoadFactor = ((SeparatorDesignStandard) getDesignStandard().get("separator process design"))
-          .getGasLoadFactor();
+      gasLoadFactor =
+          ((SeparatorDesignStandard) getDesignStandard().get("separator process design"))
+              .getGasLoadFactor();
       Fg = ((SeparatorDesignStandard) getDesignStandard().get("separator process design")).getFg();
-      volumeSafetyFactor = ((SeparatorDesignStandard) getDesignStandard().get("separator process design"))
-          .getVolumetricDesignFactor();
+      volumeSafetyFactor =
+          ((SeparatorDesignStandard) getDesignStandard().get("separator process design"))
+              .getVolumetricDesignFactor();
       retentionTime = 120.0; // ((SeparatorDesignStandard)
                              // getDesignStandard().get("separator process
                              // design")).getLiquidRetentionTime("API12J", this);
@@ -86,7 +88,7 @@ public void displayResults() {
     Container dialogContentPane = dialog.getContentPane();
     dialogContentPane.setLayout(new BorderLayout());
 
-    String[] names = { "Name", "Value", "Unit" };
+    String[] names = {"Name", "Value", "Unit"};
     String[][] table = new String[16][3]; // createTable(getProcessEquipment().getName());
 
     table[1][0] = "Separator Inner Diameter";
@@ -195,7 +197,8 @@ public void calcDesign() {
 
     // alternative design
     double bubbleDiameter = 250.0e-6;
-    double bubVelocity = 9.82 * Math.pow(bubbleDiameter, 2.0) * (liqDensity - gasDensity) / 18.0 / liqViscosity;
+    double bubVelocity =
+        9.82 * Math.pow(bubbleDiameter, 2.0) * (liqDensity - gasDensity) / 18.0 / liqViscosity;
     double Ar = ((SeparatorInterface) getProcessEquipment()).getThermoSystem().getLiquidVolume()
         / 1e5 / bubVelocity;
     double Daim = Math.sqrt(Ar / 4.0);
@@ -231,15 +234,11 @@ public void calcDesign() {
     // }
 
     /*
-     * System.out.println("wall thickness: " + separator.getName() + " " +
-     * getWallThickness() +
-     * " m"); System.out.println("separator dry weigth: " + emptyVesselWeight +
-     * " kg");
+     * System.out.println("wall thickness: " + separator.getName() + " " + getWallThickness() +
+     * " m"); System.out.println("separator dry weigth: " + emptyVesselWeight + " kg");
      * System.out.println("total skid weigth: " + totalSkidWeight + " kg");
-     * System.out.println("foot print: width:" + moduleWidth + " length " +
-     * moduleLength +
-     * " height " + moduleHeight + " meter.");
-     * System.out.println("mechanical price: " +
+     * System.out.println("foot print: width:" + moduleWidth + " length " + moduleLength +
+     * " height " + moduleHeight + " meter."); System.out.println("mechanical price: " +
      * materialsCost + " kNOK");
      */
     setWeigthVesselShell(emptyVesselWeight);
diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/DistillationTraySection.java b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/DistillationTraySection.java
index 3f1bb30ee1..65fd2595ab 100644
--- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/DistillationTraySection.java
+++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/DistillationTraySection.java
@@ -17,8 +17,8 @@ public class DistillationTraySection extends SepDesignSection {
    * </p>
    *
    * @param separatorSection a
-   *                         {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection}
-   *                         object
+   *        {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection}
+   *        object
    */
   public DistillationTraySection(SeparatorSection separatorSection) {
     super(separatorSection);
diff --git a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChart.java b/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChart.java
index 5e25c53c5b..dfdfb8dbb8 100644
--- a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChart.java
+++ b/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChart.java
@@ -417,7 +417,9 @@ public boolean equals(Object obj) {
   }
 
   /**
-   * <p>Getter for the field <code>maxSpeedCurve</code>.</p>
+   * <p>
+   * Getter for the field <code>maxSpeedCurve</code>.
+   * </p>
    *
    * @return a double
    */
@@ -426,7 +428,9 @@ public double getMaxSpeedCurve() {
   }
 
   /**
-   * <p>Setter for the field <code>maxSpeedCurve</code>.</p>
+   * <p>
+   * Setter for the field <code>maxSpeedCurve</code>.
+   * </p>
    *
    * @param maxSpeedCurve a double
    */
@@ -435,7 +439,9 @@ public void setMaxSpeedCurve(double maxSpeedCurve) {
   }
 
   /**
-   * <p>Getter for the field <code>minSpeedCurve</code>.</p>
+   * <p>
+   * Getter for the field <code>minSpeedCurve</code>.
+   * </p>
    *
    * @return a double
    */
@@ -444,7 +450,9 @@ public double getMinSpeedCurve() {
   }
 
   /**
-   * <p>Setter for the field <code>minSpeedCurve</code>.</p>
+   * <p>
+   * Setter for the field <code>minSpeedCurve</code>.
+   * </p>
    *
    * @param minSpeedCurve a double
    */
diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/NeqGasScrubber.java b/src/main/java/neqsim/processsimulation/processequipment/separator/NeqGasScrubber.java
index 862c183a20..377cfcf092 100644
--- a/src/main/java/neqsim/processsimulation/processequipment/separator/NeqGasScrubber.java
+++ b/src/main/java/neqsim/processsimulation/processequipment/separator/NeqGasScrubber.java
@@ -47,10 +47,9 @@ public NeqGasScrubber(String name) {
    * Constructor for NeqGasScrubber.
    * </p>
    *
-   * @param name        a {@link java.lang.String} object
-   * @param inletStream a
-   *                    {@link neqsim.processsimulation.processequipment.stream.StreamInterface}
-   *                    object
+   * @param name a {@link java.lang.String} object
+   * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface}
+   *        object
    */
   public NeqGasScrubber(String name, StreamInterface inletStream) {
     super(name, inletStream);
@@ -135,6 +134,5 @@ public void run(UUID id) {
 
   /** {@inheritDoc} */
   @Override
-  public void displayResult() {
-  }
+  public void displayResult() {}
 }
diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/Separator.java b/src/main/java/neqsim/processsimulation/processequipment/separator/Separator.java
index 1b0e3c9f0c..73b93d265a 100644
--- a/src/main/java/neqsim/processsimulation/processequipment/separator/Separator.java
+++ b/src/main/java/neqsim/processsimulation/processequipment/separator/Separator.java
@@ -64,8 +64,10 @@ public class Separator extends ProcessEquipmentBaseClass implements SeparatorInt
 
   /** LiquidLevel as volume fraction of liquidvolume/(liquid + gas volume). */
   private double liquidLevel = 0.5;
-  double liquidVolume = Math.PI * internalDiameter * internalDiameter / 4.0 * separatorLength * liquidLevel;
-  double gasVolume = Math.PI * internalDiameter * internalDiameter / 4.0 * separatorLength * (1.0 - liquidLevel);
+  double liquidVolume =
+      Math.PI * internalDiameter * internalDiameter / 4.0 * separatorLength * liquidLevel;
+  double gasVolume =
+      Math.PI * internalDiameter * internalDiameter / 4.0 * separatorLength * (1.0 - liquidLevel);
   private double designLiquidLevelFraction = 0.8;
   ArrayList<SeparatorSection> separatorSection = new ArrayList<SeparatorSection>();
 
@@ -84,10 +86,9 @@ public Separator(String name) {
   /**
    * Constructor for Separator.
    *
-   * @param name        a {@link java.lang.String} object
-   * @param inletStream a
-   *                    {@link neqsim.processsimulation.processequipment.stream.StreamInterface}
-   *                    object
+   * @param name a {@link java.lang.String} object
+   * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface}
+   *        object
    */
   public Separator(String name, StreamInterface inletStream) {
     this(name);
@@ -112,9 +113,8 @@ public void initMechanicalDesign() {
    * setInletStream.
    * </p>
    *
-   * @param inletStream a
-   *                    {@link neqsim.processsimulation.processequipment.stream.StreamInterface}
-   *                    object
+   * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface}
+   *        object
    */
   public void setInletStream(StreamInterface inletStream) {
     inletStreamMixer.addStream(inletStream);
@@ -132,9 +132,8 @@ public void setInletStream(StreamInterface inletStream) {
    * addStream.
    * </p>
    *
-   * @param newStream a
-   *                  {@link neqsim.processsimulation.processequipment.stream.StreamInterface}
-   *                  object
+   * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface}
+   *        object
    */
   public void addStream(StreamInterface newStream) {
     if (numberOfInputStreams == 0) {
@@ -150,9 +149,7 @@ public void addStream(StreamInterface newStream) {
    * Getter for the field <code>liquidOutStream</code>.
    * </p>
    *
-   * @return a
-   *         {@link neqsim.processsimulation.processequipment.stream.StreamInterface}
-   *         object
+   * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object
    */
   public StreamInterface getLiquidOutStream() {
     return liquidOutStream;
@@ -163,9 +160,7 @@ public StreamInterface getLiquidOutStream() {
    * Getter for the field <code>gasOutStream</code>.
    * </p>
    *
-   * @return a
-   *         {@link neqsim.processsimulation.processequipment.stream.StreamInterface}
-   *         object
+   * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object
    */
   public StreamInterface getGasOutStream() {
     return gasOutStream;
@@ -176,9 +171,7 @@ public StreamInterface getGasOutStream() {
    * getGas.
    * </p>
    *
-   * @return a
-   *         {@link neqsim.processsimulation.processequipment.stream.StreamInterface}
-   *         object
+   * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object
    */
   public StreamInterface getGas() {
     return getGasOutStream();
@@ -189,9 +182,7 @@ public StreamInterface getGas() {
    * getLiquid.
    * </p>
    *
-   * @return a
-   *         {@link neqsim.processsimulation.processequipment.stream.StreamInterface}
-   *         object
+   * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object
    */
   public StreamInterface getLiquid() {
     return getLiquidOutStream();
@@ -240,7 +231,8 @@ public void run(UUID id) {
       thermoSystem = thermoSystem2;
     } else {
       try {
-        liquidVolume = Math.PI * internalDiameter * internalDiameter / 4.0 * separatorLength * liquidLevel;
+        liquidVolume =
+            Math.PI * internalDiameter * internalDiameter / 4.0 * separatorLength * liquidLevel;
         gasVolume = Math.PI * internalDiameter * internalDiameter / 4.0 * separatorLength
             * (1.0 - liquidLevel);
         thermoSystem = thermoSystem2.clone();
@@ -323,7 +315,8 @@ public void runTransient(double dt, UUID id) {
       thermoSystem.init(0);
       for (int i = 0; i < thermoSystem.getPhase(0).getNumberOfComponents(); i++) {
         double dncomp = 0.0;
-        dncomp += inletStreamMixer.getOutletStream().getThermoSystem().getComponent(i).getNumberOfmoles();
+        dncomp +=
+            inletStreamMixer.getOutletStream().getThermoSystem().getComponent(i).getNumberOfmoles();
         double dniliq = 0.0;
         if (hasliq) {
           dniliq = -liquidOutStream.getThermoSystem().getComponent(i).getNumberOfmoles();
@@ -595,7 +588,8 @@ public double getDeRatedGasLoadFactor() {
   public double getDeRatedGasLoadFactor(int phase) {
     thermoSystem.initPhysicalProperties();
     double derating = 1.0;
-    double surfaceTension = thermoSystem.getInterphaseProperties().getSurfaceTension(phase - 1, phase);
+    double surfaceTension =
+        thermoSystem.getInterphaseProperties().getSurfaceTension(phase - 1, phase);
     if (surfaceTension < 10.0e-3) {
       derating = 1.0 - 0.5 * (10.0e-3 - surfaceTension) / 10.0e-3;
     }
@@ -857,9 +851,7 @@ public boolean equals(Object obj) {
    * getFeedStream.
    * </p>
    *
-   * @return a
-   *         {@link neqsim.processsimulation.processequipment.stream.StreamInterface}
-   *         object
+   * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object
    */
   public StreamInterface getFeedStream() {
     return inletStreamMixer.getOutletStream();
@@ -872,8 +864,7 @@ public String toJson() {
   }
 
   /*
-   * private class SeparatorReport extends Object{ public Double gasLoadFactor;
-   * SeparatorReport(){
+   * private class SeparatorReport extends Object{ public Double gasLoadFactor; SeparatorReport(){
    * gasLoadFactor = getGasLoadFactor(); } }
    *
    * public SeparatorReport getReport(){ return this.new SeparatorReport(); }
diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/ValveSection.java b/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/ValveSection.java
index e400ab42b5..3dd8296fa4 100644
--- a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/ValveSection.java
+++ b/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/ValveSection.java
@@ -21,9 +21,7 @@ public class ValveSection extends SeparatorSection {
    *
    * @param name a {@link java.lang.String} object
    * @param type a {@link java.lang.String} object
-   * @param sep  a
-   *             {@link neqsim.processsimulation.processequipment.separator.Separator}
-   *             object
+   * @param sep a {@link neqsim.processsimulation.processequipment.separator.Separator} object
    */
   public ValveSection(String name, String type, Separator sep) {
     super(name, type, sep);
diff --git a/src/main/java/neqsim/pvtsimulation/simulation/DensitySim.java b/src/main/java/neqsim/pvtsimulation/simulation/DensitySim.java
index 3860c23a11..01b3a1e112 100644
--- a/src/main/java/neqsim/pvtsimulation/simulation/DensitySim.java
+++ b/src/main/java/neqsim/pvtsimulation/simulation/DensitySim.java
@@ -50,7 +50,7 @@ public DensitySim(SystemInterface tempSystem) {
    * </p>
    *
    * @param temperature an array of type double
-   * @param pressure    an array of type double
+   * @param pressure an array of type double
    */
   public void setTemperaturesAndPressures(double[] temperature, double[] pressure) {
     this.pressure = pressure;
@@ -71,7 +71,7 @@ public void runTuning() {
 
       for (int i = 0; i < experimentalData[0].length; i++) {
         ViscosityFunction function = new ViscosityFunction();
-        double[] guess = { 1.0 }; // getThermoSystem().getPhase(0).getComponent(0).getCriticalViscosity()};
+        double[] guess = {1.0}; // getThermoSystem().getPhase(0).getComponent(0).getCriticalViscosity()};
         function.setInitialGuess(guess);
 
         SystemInterface tempSystem = getThermoSystem(); // getThermoSystem().clone();
@@ -80,10 +80,11 @@ public void runTuning() {
         tempSystem.setPressure(pressure[i]);
         thermoOps.TPflash();
         // tempSystem.display();
-        double[] sample1 = { temperature[i] };
+        double[] sample1 = {temperature[i]};
         double viscosity = experimentalData[0][i];
-        double[] standardDeviation1 = { 1.5 };
-        SampleValue sample = new SampleValue(viscosity, viscosity / 50.0, sample1, standardDeviation1);
+        double[] standardDeviation1 = {1.5};
+        SampleValue sample =
+            new SampleValue(viscosity, viscosity / 50.0, sample1, standardDeviation1);
         sample.setFunction(function);
         sample.setThermodynamicSystem(tempSystem);
         sampleList.add(sample);
@@ -129,7 +130,8 @@ public void runCalc() {
         oilDensity[i] = getThermoSystem().getPhase("oil").getPhysicalProperties().getViscosity();
       }
       if (getThermoSystem().hasPhaseType("aqueous")) {
-        aqueousDensity[i] = getThermoSystem().getPhase("aqueous").getPhysicalProperties().getViscosity();
+        aqueousDensity[i] =
+            getThermoSystem().getPhase("aqueous").getPhysicalProperties().getViscosity();
       }
     }
   }
@@ -160,12 +162,12 @@ public static void main(String[] args) {
     tempSystem.init(1);
 
     DensitySim sepSim = new DensitySim(tempSystem);
-    double[] temps = { 300.15, 293.15, 283.15, 273.15, 264.15 };
-    double[] pres = { 5, 5, 5, 5.0, 5.0 };
+    double[] temps = {300.15, 293.15, 283.15, 273.15, 264.15};
+    double[] pres = {5, 5, 5, 5.0, 5.0};
     sepSim.setTemperaturesAndPressures(temps, pres);
     sepSim.runCalc();
 
-    double[][] expData = { { 2e-4, 3e-4, 4e-4, 5e-4, 6e-4 }, };
+    double[][] expData = {{2e-4, 3e-4, 4e-4, 5e-4, 6e-4},};
     sepSim.setExperimentalData(expData);
     // sepSim.runTuning();
     sepSim.runCalc();
diff --git a/src/main/java/neqsim/pvtsimulation/simulation/ViscositySim.java b/src/main/java/neqsim/pvtsimulation/simulation/ViscositySim.java
index 8d723da4eb..2e55dd3ea7 100644
--- a/src/main/java/neqsim/pvtsimulation/simulation/ViscositySim.java
+++ b/src/main/java/neqsim/pvtsimulation/simulation/ViscositySim.java
@@ -50,7 +50,7 @@ public ViscositySim(SystemInterface tempSystem) {
    * </p>
    *
    * @param temperature an array of type double
-   * @param pressure    an array of type double
+   * @param pressure an array of type double
    */
   public void setTemperaturesAndPressures(double[] temperature, double[] pressure) {
     this.pressure = pressure;
@@ -71,7 +71,7 @@ public void runTuning() {
 
       for (int i = 0; i < experimentalData[0].length; i++) {
         ViscosityFunction function = new ViscosityFunction();
-        double[] guess = { 1.0 }; // getThermoSystem().getPhase(0).getComponent(0).getCriticalViscosity()};
+        double[] guess = {1.0}; // getThermoSystem().getPhase(0).getComponent(0).getCriticalViscosity()};
         function.setInitialGuess(guess);
 
         SystemInterface tempSystem = getThermoSystem().clone();
@@ -80,10 +80,11 @@ public void runTuning() {
         tempSystem.setPressure(pressure[i]);
         thermoOps.TPflash();
         // tempSystem.display();
-        double[] sample1 = { temperature[i] };
+        double[] sample1 = {temperature[i]};
         double viscosity = experimentalData[0][i];
-        double[] standardDeviation1 = { 1.5 };
-        SampleValue sample = new SampleValue(viscosity, viscosity / 50.0, sample1, standardDeviation1);
+        double[] standardDeviation1 = {1.5};
+        SampleValue sample =
+            new SampleValue(viscosity, viscosity / 50.0, sample1, standardDeviation1);
         sample.setFunction(function);
         sample.setThermodynamicSystem(tempSystem);
         sampleList.add(sample);
@@ -127,7 +128,8 @@ public void runCalc() {
         oilViscosity[i] = getThermoSystem().getPhase("oil").getPhysicalProperties().getViscosity();
       }
       if (getThermoSystem().hasPhaseType("aqueous")) {
-        aqueousViscosity[i] = getThermoSystem().getPhase("aqueous").getPhysicalProperties().getViscosity();
+        aqueousViscosity[i] =
+            getThermoSystem().getPhase("aqueous").getPhysicalProperties().getViscosity();
       }
     }
   }
@@ -160,12 +162,12 @@ public static void main(String[] args) {
     tempSystem.init(1);
 
     ViscositySim sepSim = new ViscositySim(tempSystem);
-    double[] temps = { 300.15, 293.15, 283.15, 273.15, 264.15 };
-    double[] pres = { 5, 5, 5, 5.0, 5.0 };
+    double[] temps = {300.15, 293.15, 283.15, 273.15, 264.15};
+    double[] pres = {5, 5, 5, 5.0, 5.0};
     sepSim.setTemperaturesAndPressures(temps, pres);
     sepSim.runCalc();
 
-    double[][] expData = { { 2e-4, 3e-4, 4e-4, 5e-4, 6e-4 }, };
+    double[][] expData = {{2e-4, 3e-4, 4e-4, 5e-4, 6e-4},};
     sepSim.setExperimentalData(expData);
     // sepSim.runTuning();
     sepSim.runCalc();
diff --git a/src/main/java/neqsim/pvtsimulation/simulation/ViscosityWaxOilSim.java b/src/main/java/neqsim/pvtsimulation/simulation/ViscosityWaxOilSim.java
index 2b5f41821b..2b2d543b5c 100644
--- a/src/main/java/neqsim/pvtsimulation/simulation/ViscosityWaxOilSim.java
+++ b/src/main/java/neqsim/pvtsimulation/simulation/ViscosityWaxOilSim.java
@@ -54,7 +54,7 @@ public ViscosityWaxOilSim(SystemInterface tempSystem) {
    * </p>
    *
    * @param temperature an array of type double
-   * @param pressure    an array of type double
+   * @param pressure an array of type double
    */
   public void setTemperaturesAndPressures(double[] temperature, double[] pressure) {
     this.pressure = pressure;
@@ -75,7 +75,7 @@ public void runTuning() {
 
       for (int i = 0; i < experimentalData[0].length; i++) {
         ViscosityFunction function = new ViscosityFunction();
-        double[] guess = { 1.0 }; // getThermoSystem().getPhase(0).getComponent(0).getCriticalViscosity()};
+        double[] guess = {1.0}; // getThermoSystem().getPhase(0).getComponent(0).getCriticalViscosity()};
         function.setInitialGuess(guess);
 
         SystemInterface tempSystem = getThermoSystem().clone();
@@ -84,10 +84,11 @@ public void runTuning() {
         tempSystem.setPressure(pressure[i]);
         thermoOps.TPflash();
         // tempSystem.display();
-        double[] sample1 = { shareRate[i] };
+        double[] sample1 = {shareRate[i]};
         double viscosity = experimentalData[0][i];
-        double[] standardDeviation1 = { 1.5 };
-        SampleValue sample = new SampleValue(viscosity, viscosity / 50.0, sample1, standardDeviation1);
+        double[] standardDeviation1 = {1.5};
+        SampleValue sample =
+            new SampleValue(viscosity, viscosity / 50.0, sample1, standardDeviation1);
         sample.setFunction(function);
         sample.setThermodynamicSystem(tempSystem);
         sampleList.add(sample);
@@ -127,7 +128,8 @@ public void runCalc() {
       getThermoSystem().initPhysicalProperties();
       waxFraction[i] = 0.0;
       if (getThermoSystem().hasPhaseType("wax") && getThermoSystem().hasPhaseType("oil")) {
-        waxFraction[i] = getThermoSystem().getWtFraction(getThermoSystem().getPhaseNumberOfPhase("wax"));
+        waxFraction[i] =
+            getThermoSystem().getWtFraction(getThermoSystem().getPhaseNumberOfPhase("wax"));
         oilwaxDispersionViscosity[i] = getThermoSystem().getPhase("oil").getPhysicalProperties()
             .getViscosityOfWaxyOil(waxFraction[i], getShareRate()[i]);
       }
@@ -138,7 +140,8 @@ public void runCalc() {
         oilViscosity[i] = getThermoSystem().getPhase("oil").getPhysicalProperties().getViscosity();
       }
       if (getThermoSystem().hasPhaseType("aqueous")) {
-        aqueousViscosity[i] = getThermoSystem().getPhase("aqueous").getPhysicalProperties().getViscosity();
+        aqueousViscosity[i] =
+            getThermoSystem().getPhase("aqueous").getPhysicalProperties().getViscosity();
       }
     }
   }
@@ -169,13 +172,13 @@ public static void main(String[] args) {
     tempSystem.init(1);
 
     ViscosityWaxOilSim sepSim = new ViscosityWaxOilSim(tempSystem);
-    double[] temps = { 300.15, 293.15, 283.15, 273.15, 264.15 };
-    double[] pres = { 5, 5, 5, 5.0, 5.0 };
+    double[] temps = {300.15, 293.15, 283.15, 273.15, 264.15};
+    double[] pres = {5, 5, 5, 5.0, 5.0};
     sepSim.setTemperaturesAndPressures(temps, pres);
-    sepSim.setShareRate(new double[] { 0, 0, 0, 100, 100 });
+    sepSim.setShareRate(new double[] {0, 0, 0, 100, 100});
     sepSim.runCalc();
 
-    double[][] expData = { { 2e-4, 3e-4, 4e-4, 5e-4, 6e-4 }, };
+    double[][] expData = {{2e-4, 3e-4, 4e-4, 5e-4, 6e-4},};
     sepSim.setExperimentalData(expData);
     sepSim.runTuning();
     // sepSim.runCalc();
diff --git a/src/test/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/shipsystem/LNGshipTest.java b/src/test/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/shipsystem/LNGshipTest.java
index b151d7cd9e..10d28d3042 100644
--- a/src/test/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/shipsystem/LNGshipTest.java
+++ b/src/test/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/shipsystem/LNGshipTest.java
@@ -4,7 +4,6 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import neqsim.fluidmechanics.flowsystem.twophaseflowsystem.shipsystem.LNGship;
 import neqsim.thermo.system.SystemInterface;
 
 class LNGshipTest {
diff --git a/src/test/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/PallRingPackingTest.java b/src/test/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/PallRingPackingTest.java
index 82097d0fb0..d32c8c4865 100644
--- a/src/test/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/PallRingPackingTest.java
+++ b/src/test/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/PallRingPackingTest.java
@@ -3,7 +3,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import neqsim.fluidmechanics.geometrydefinitions.internalgeometry.packings.PallRingPacking;
 
 public class PallRingPackingTest {
   static PallRingPacking prp;
diff --git a/src/test/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/RachigRingPackingTest.java b/src/test/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/RachigRingPackingTest.java
index db47ca2819..2cd5bb7710 100644
--- a/src/test/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/RachigRingPackingTest.java
+++ b/src/test/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/RachigRingPackingTest.java
@@ -3,7 +3,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import neqsim.fluidmechanics.geometrydefinitions.internalgeometry.packings.RachigRingPacking;
 
 public class RachigRingPackingTest {
   static RachigRingPacking rp;
diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugTest.java b/src/test/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugTest.java
index 47d8486bd7..8d47db4019 100644
--- a/src/test/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugTest.java
+++ b/src/test/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugTest.java
@@ -2,7 +2,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.Test;
-import neqsim.processsimulation.measurementdevice.simpleflowregime.SevereSlugAnalyser;
 import neqsim.processsimulation.processequipment.stream.Stream;
 
 public class SevereSlugTest {
diff --git a/src/test/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesignTest.java b/src/test/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesignTest.java
index b99ec66851..1f1601fc80 100644
--- a/src/test/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesignTest.java
+++ b/src/test/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesignTest.java
@@ -3,7 +3,6 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import neqsim.processsimulation.costestimation.CostEstimateBaseClass;
-import neqsim.processsimulation.mechanicaldesign.SystemMechanicalDesign;
 import neqsim.processsimulation.mechanicaldesign.pipeline.PipelineMechanicalDesign;
 import neqsim.processsimulation.mechanicaldesign.separator.GasScrubberMechanicalDesign;
 import neqsim.processsimulation.mechanicaldesign.separator.SeparatorMechanicalDesign;
diff --git a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorCalculationTest.java b/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorCalculationTest.java
index ce43c53be0..4d086a27e0 100644
--- a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorCalculationTest.java
+++ b/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorCalculationTest.java
@@ -3,7 +3,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import neqsim.processsimulation.processequipment.compressor.Compressor;
 import neqsim.processsimulation.processequipment.stream.Stream;
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
diff --git a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorChartTest.java b/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorChartTest.java
index 061f976d70..ed1692a38d 100644
--- a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorChartTest.java
+++ b/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorChartTest.java
@@ -4,8 +4,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import neqsim.processsimulation.processequipment.compressor.Compressor;
-import neqsim.processsimulation.processequipment.compressor.CompressorChart;
 import neqsim.processsimulation.processequipment.stream.Stream;
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
diff --git a/src/test/java/neqsim/processsimulation/processequipment/distillation/DistillationColumnTest.java b/src/test/java/neqsim/processsimulation/processequipment/distillation/DistillationColumnTest.java
index e547ccb886..a29912d86c 100644
--- a/src/test/java/neqsim/processsimulation/processequipment/distillation/DistillationColumnTest.java
+++ b/src/test/java/neqsim/processsimulation/processequipment/distillation/DistillationColumnTest.java
@@ -2,8 +2,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.Test;
-import neqsim.processsimulation.processequipment.distillation.Condenser;
-import neqsim.processsimulation.processequipment.distillation.DistillationColumn;
 import neqsim.processsimulation.processequipment.stream.Stream;
 import neqsim.processsimulation.processequipment.stream.StreamInterface;
 
@@ -12,7 +10,7 @@ public class DistillationColumnTest {
    * @throws java.lang.Exception
    */
   @Test
-  public void DistillationColumnTest() throws Exception {
+  public void testRun() throws Exception {
     neqsim.thermo.system.SystemInterface richTEG =
         new neqsim.thermo.system.SystemSrkCPAstatoil(273.15 + 42.0, 10.00);
     richTEG.addComponent("nitrogen", 0.0003884521907420086);
diff --git a/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerTest.java b/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerTest.java
index 07b9a45661..f35dbe5043 100644
--- a/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerTest.java
+++ b/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerTest.java
@@ -3,7 +3,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger;
 import neqsim.processsimulation.processequipment.separator.Separator;
 import neqsim.processsimulation.processequipment.stream.Stream;
 import neqsim.processsimulation.processequipment.util.Recycle;
diff --git a/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterTest.java b/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterTest.java
index 76d117fa91..f0cee87c30 100644
--- a/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterTest.java
+++ b/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterTest.java
@@ -4,7 +4,6 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import neqsim.processsimulation.processequipment.heatexchanger.Heater;
 import neqsim.processsimulation.processequipment.stream.Stream;
 import neqsim.processsimulation.processsystem.ProcessSystem;
 import neqsim.thermo.system.SystemSrkEos;
diff --git a/src/test/java/neqsim/processsimulation/processequipment/manifold/ManifoldTest.java b/src/test/java/neqsim/processsimulation/processequipment/manifold/ManifoldTest.java
index f8929619a2..681046cedc 100644
--- a/src/test/java/neqsim/processsimulation/processequipment/manifold/ManifoldTest.java
+++ b/src/test/java/neqsim/processsimulation/processequipment/manifold/ManifoldTest.java
@@ -2,7 +2,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.Test;
-import neqsim.processsimulation.processequipment.manifold.Manifold;
 import neqsim.processsimulation.processequipment.stream.Stream;
 import neqsim.processsimulation.processsystem.ProcessSystem;
 import neqsim.thermo.system.SystemSrkEos;
diff --git a/src/test/java/neqsim/processsimulation/processequipment/mixer/MixerTest.java b/src/test/java/neqsim/processsimulation/processequipment/mixer/MixerTest.java
index cd79139c3e..7a956fc1fd 100644
--- a/src/test/java/neqsim/processsimulation/processequipment/mixer/MixerTest.java
+++ b/src/test/java/neqsim/processsimulation/processequipment/mixer/MixerTest.java
@@ -5,7 +5,6 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import neqsim.processsimulation.processequipment.mixer.Mixer;
 import neqsim.processsimulation.processequipment.stream.Stream;
 import neqsim.processsimulation.processsystem.ProcessSystem;
 import neqsim.thermo.system.SystemSrkEos;
diff --git a/src/test/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipeTest.java b/src/test/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipeTest.java
index 5b776f5879..982b81f934 100644
--- a/src/test/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipeTest.java
+++ b/src/test/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipeTest.java
@@ -2,7 +2,6 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import neqsim.processsimulation.processequipment.pipeline.AdiabaticTwoPhasePipe;
 import neqsim.processsimulation.processequipment.stream.Stream;
 
 public class AdiabaticTwoPhasePipeTest {
diff --git a/src/test/java/neqsim/processsimulation/processequipment/pipeline/BeggsAndBrillsPipeTest.java b/src/test/java/neqsim/processsimulation/processequipment/pipeline/BeggsAndBrillsPipeTest.java
index 4d3d41aed9..7383281f99 100644
--- a/src/test/java/neqsim/processsimulation/processequipment/pipeline/BeggsAndBrillsPipeTest.java
+++ b/src/test/java/neqsim/processsimulation/processequipment/pipeline/BeggsAndBrillsPipeTest.java
@@ -2,7 +2,6 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills;
 import neqsim.processsimulation.processequipment.stream.Stream;
 import neqsim.thermo.ThermodynamicConstantsInterface;
 import neqsim.thermodynamicoperations.ThermodynamicOperations;
diff --git a/src/test/java/neqsim/processsimulation/processequipment/pipeline/PipelineTest.java b/src/test/java/neqsim/processsimulation/processequipment/pipeline/PipelineTest.java
index ecc527b8fd..7ed7056421 100644
--- a/src/test/java/neqsim/processsimulation/processequipment/pipeline/PipelineTest.java
+++ b/src/test/java/neqsim/processsimulation/processequipment/pipeline/PipelineTest.java
@@ -2,9 +2,6 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import neqsim.processsimulation.processequipment.pipeline.AdiabaticPipe;
-import neqsim.processsimulation.processequipment.pipeline.OnePhasePipeLine;
-import neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills;
 import neqsim.processsimulation.processequipment.stream.Stream;
 
 public class PipelineTest {
diff --git a/src/test/java/neqsim/processsimulation/processequipment/pump/PumpChartTest.java b/src/test/java/neqsim/processsimulation/processequipment/pump/PumpChartTest.java
index 0d4d5ba188..de6b4d7b51 100644
--- a/src/test/java/neqsim/processsimulation/processequipment/pump/PumpChartTest.java
+++ b/src/test/java/neqsim/processsimulation/processequipment/pump/PumpChartTest.java
@@ -2,7 +2,6 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import neqsim.processsimulation.processequipment.pump.PumpChart;
 
 public class PumpChartTest {
   @Test
diff --git a/src/test/java/neqsim/processsimulation/processequipment/pump/PumpTest.java b/src/test/java/neqsim/processsimulation/processequipment/pump/PumpTest.java
index 7d98cdaa9f..ef11df0683 100644
--- a/src/test/java/neqsim/processsimulation/processequipment/pump/PumpTest.java
+++ b/src/test/java/neqsim/processsimulation/processequipment/pump/PumpTest.java
@@ -2,7 +2,6 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import neqsim.processsimulation.processequipment.pump.Pump;
 import neqsim.processsimulation.processequipment.stream.Stream;
 
 /**
diff --git a/src/test/java/neqsim/processsimulation/processequipment/separator/SeparatorTest.java b/src/test/java/neqsim/processsimulation/processequipment/separator/SeparatorTest.java
index c8d964d6a4..01d0308865 100644
--- a/src/test/java/neqsim/processsimulation/processequipment/separator/SeparatorTest.java
+++ b/src/test/java/neqsim/processsimulation/processequipment/separator/SeparatorTest.java
@@ -4,7 +4,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import neqsim.processsimulation.measurementdevice.LevelTransmitter;
-import neqsim.processsimulation.processequipment.separator.Separator;
 import neqsim.processsimulation.processequipment.stream.Stream;
 import neqsim.processsimulation.processequipment.stream.StreamInterface;
 import neqsim.processsimulation.processsystem.ProcessSystem;
diff --git a/src/test/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitterTest.java b/src/test/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitterTest.java
index 06f58a5655..41f2863abe 100644
--- a/src/test/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitterTest.java
+++ b/src/test/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitterTest.java
@@ -7,8 +7,6 @@
 import org.junit.jupiter.api.Test;
 import neqsim.processsimulation.processequipment.compressor.Compressor;
 import neqsim.processsimulation.processequipment.mixer.Mixer;
-import neqsim.processsimulation.processequipment.splitter.ComponentSplitter;
-import neqsim.processsimulation.processequipment.splitter.Splitter;
 import neqsim.processsimulation.processequipment.stream.Stream;
 import neqsim.processsimulation.processequipment.stream.StreamInterface;
 import neqsim.processsimulation.processequipment.util.Recycle;
diff --git a/src/test/java/neqsim/processsimulation/processequipment/stream/StreamTest.java b/src/test/java/neqsim/processsimulation/processequipment/stream/StreamTest.java
index c08ec54788..8fe0f0fd64 100644
--- a/src/test/java/neqsim/processsimulation/processequipment/stream/StreamTest.java
+++ b/src/test/java/neqsim/processsimulation/processequipment/stream/StreamTest.java
@@ -6,7 +6,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import neqsim.processsimulation.processequipment.stream.Stream;
 import neqsim.processsimulation.processsystem.ProcessSystem;
 import neqsim.thermo.system.SystemSrkEos;
 
diff --git a/src/test/java/neqsim/processsimulation/processequipment/stream/VirtualStreamTest.java b/src/test/java/neqsim/processsimulation/processequipment/stream/VirtualStreamTest.java
index d62ad1993b..8cc3ebca69 100644
--- a/src/test/java/neqsim/processsimulation/processequipment/stream/VirtualStreamTest.java
+++ b/src/test/java/neqsim/processsimulation/processequipment/stream/VirtualStreamTest.java
@@ -3,8 +3,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import neqsim.processsimulation.processequipment.stream.Stream;
-import neqsim.processsimulation.processequipment.stream.VirtualStream;
 import neqsim.processsimulation.processsystem.ProcessSystem;
 import neqsim.thermo.system.SystemSrkEos;
 
diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/FlowSetterTest.java b/src/test/java/neqsim/processsimulation/processequipment/util/FlowSetterTest.java
index d9b095da86..b76f835775 100644
--- a/src/test/java/neqsim/processsimulation/processequipment/util/FlowSetterTest.java
+++ b/src/test/java/neqsim/processsimulation/processequipment/util/FlowSetterTest.java
@@ -6,7 +6,6 @@
 import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator;
 import neqsim.processsimulation.processequipment.stream.Stream;
 import neqsim.processsimulation.processequipment.stream.StreamInterface;
-import neqsim.processsimulation.processequipment.util.FlowSetter;
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
 
diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/GORfitterTest.java b/src/test/java/neqsim/processsimulation/processequipment/util/GORfitterTest.java
index ffd1e4f4eb..2a62683dbc 100644
--- a/src/test/java/neqsim/processsimulation/processequipment/util/GORfitterTest.java
+++ b/src/test/java/neqsim/processsimulation/processequipment/util/GORfitterTest.java
@@ -4,7 +4,6 @@
 import org.junit.jupiter.api.Test;
 import neqsim.processsimulation.measurementdevice.MultiPhaseMeter;
 import neqsim.processsimulation.processequipment.stream.Stream;
-import neqsim.processsimulation.processequipment.util.GORfitter;
 import neqsim.thermo.ThermodynamicConstantsInterface;
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/MPFMfitterTest.java b/src/test/java/neqsim/processsimulation/processequipment/util/MPFMfitterTest.java
index e2577e5ecf..9f19e53327 100644
--- a/src/test/java/neqsim/processsimulation/processequipment/util/MPFMfitterTest.java
+++ b/src/test/java/neqsim/processsimulation/processequipment/util/MPFMfitterTest.java
@@ -4,7 +4,6 @@
 import org.junit.jupiter.api.Test;
 import neqsim.processsimulation.measurementdevice.MultiPhaseMeter;
 import neqsim.processsimulation.processequipment.stream.Stream;
-import neqsim.processsimulation.processequipment.util.MPFMfitter;
 import neqsim.thermo.ThermodynamicConstantsInterface;
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/PressureDropTest.java b/src/test/java/neqsim/processsimulation/processequipment/util/PressureDropTest.java
index a205e397a3..fba8db02f2 100644
--- a/src/test/java/neqsim/processsimulation/processequipment/util/PressureDropTest.java
+++ b/src/test/java/neqsim/processsimulation/processequipment/util/PressureDropTest.java
@@ -3,7 +3,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.Test;
 import neqsim.processsimulation.processequipment.stream.Stream;
-import neqsim.processsimulation.processequipment.util.PressureDrop;
 import neqsim.thermo.system.SystemSrkEos;
 
 public class PressureDropTest {
diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtilTest.java b/src/test/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtilTest.java
index 50a805e73f..b69e3703bb 100644
--- a/src/test/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtilTest.java
+++ b/src/test/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtilTest.java
@@ -5,7 +5,6 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import org.junit.jupiter.api.Test;
 import neqsim.processsimulation.processequipment.stream.Stream;
-import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil;
 import neqsim.processsimulation.processsystem.ProcessSystem;
 import neqsim.thermo.system.SystemSrkEos;
 
diff --git a/src/test/java/neqsim/processsimulation/processequipment/valve/ThrottlingValveTest.java b/src/test/java/neqsim/processsimulation/processequipment/valve/ThrottlingValveTest.java
index 8552d47555..1445dbce85 100644
--- a/src/test/java/neqsim/processsimulation/processequipment/valve/ThrottlingValveTest.java
+++ b/src/test/java/neqsim/processsimulation/processequipment/valve/ThrottlingValveTest.java
@@ -3,7 +3,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.Test;
 import neqsim.processsimulation.processequipment.stream.Stream;
-import neqsim.processsimulation.processequipment.valve.ThrottlingValve;
 
 public class ThrottlingValveTest {
   @Test
diff --git a/src/test/java/neqsim/processsimulation/processsystem/GlycolRigTest.java b/src/test/java/neqsim/processsimulation/processsystem/GlycolRigTest.java
index 4632f6f552..fb2deb2f0e 100644
--- a/src/test/java/neqsim/processsimulation/processsystem/GlycolRigTest.java
+++ b/src/test/java/neqsim/processsimulation/processsystem/GlycolRigTest.java
@@ -13,7 +13,6 @@
 import neqsim.processsimulation.processequipment.separator.Separator;
 import neqsim.processsimulation.processequipment.stream.Stream;
 import neqsim.processsimulation.processequipment.util.Recycle;
-import neqsim.processsimulation.processsystem.ProcessSystem;
 import neqsim.thermo.ThermodynamicConstantsInterface;
 
 /**
diff --git a/src/test/java/neqsim/processsimulation/processsystem/OilProcessTest.java b/src/test/java/neqsim/processsimulation/processsystem/OilProcessTest.java
index c45f98985a..366bb29092 100644
--- a/src/test/java/neqsim/processsimulation/processsystem/OilProcessTest.java
+++ b/src/test/java/neqsim/processsimulation/processsystem/OilProcessTest.java
@@ -3,7 +3,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeEach;
-import neqsim.processsimulation.processsystem.ProcessSystem;
 
 /**
  * Test class for GlycolRig.
diff --git a/src/test/java/neqsim/standards/gasquality/Draft_GERG2004Test.java b/src/test/java/neqsim/standards/gasquality/Draft_GERG2004Test.java
index 6902f52097..b29cf96733 100644
--- a/src/test/java/neqsim/standards/gasquality/Draft_GERG2004Test.java
+++ b/src/test/java/neqsim/standards/gasquality/Draft_GERG2004Test.java
@@ -3,23 +3,22 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import neqsim.standards.StandardInterface;
-import neqsim.standards.gasquality.Draft_GERG2004;
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
 
-public class Draft_GERG2004Test extends neqsim.NeqSimTest{
-    @Disabled
-    @Test
-    void testCalculate() {
-        SystemInterface testSystem = new SystemSrkEos(273.15 + 20.0, 200.0);
-        testSystem.addComponent("methane", 90.9047);
-        testSystem.addComponent("ethane", 10.095);
-        testSystem.createDatabase(true);
-        testSystem.setMixingRule(2);
+public class Draft_GERG2004Test extends neqsim.NeqSimTest {
+  @Disabled
+  @Test
+  void testCalculate() {
+    SystemInterface testSystem = new SystemSrkEos(273.15 + 20.0, 200.0);
+    testSystem.addComponent("methane", 90.9047);
+    testSystem.addComponent("ethane", 10.095);
+    testSystem.createDatabase(true);
+    testSystem.setMixingRule(2);
 
-        testSystem.init(0);
-        StandardInterface standard = new Draft_GERG2004(testSystem);
-        standard.calculate();
-        standard.display("test");
-    }
+    testSystem.init(0);
+    StandardInterface standard = new Draft_GERG2004(testSystem);
+    standard.calculate();
+    standard.display("test");
+  }
 }
diff --git a/src/test/java/neqsim/thermodynamicoperations/ThermodynamicOperationsTest.java b/src/test/java/neqsim/thermodynamicoperations/ThermodynamicOperationsTest.java
index 376e0bc304..f95ba00492 100644
--- a/src/test/java/neqsim/thermodynamicoperations/ThermodynamicOperationsTest.java
+++ b/src/test/java/neqsim/thermodynamicoperations/ThermodynamicOperationsTest.java
@@ -20,7 +20,6 @@
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemProperties;
 import neqsim.thermo.system.SystemSrkEos;
-import neqsim.thermodynamicoperations.ThermodynamicOperations;
 import neqsim.thermodynamicoperations.ThermodynamicOperations.FlashType;
 
 public class ThermodynamicOperationsTest extends neqsim.NeqSimTest {