diff --git a/src/main/java/ca/joeltherrien/randomforest/Main.java b/src/main/java/ca/joeltherrien/randomforest/Main.java
index 0328d87..9ff7593 100644
--- a/src/main/java/ca/joeltherrien/randomforest/Main.java
+++ b/src/main/java/ca/joeltherrien/randomforest/Main.java
@@ -1,7 +1,13 @@
 package ca.joeltherrien.randomforest;
 
-import ca.joeltherrien.randomforest.covariates.*;
-import ca.joeltherrien.randomforest.responses.competingrisk.*;
+import ca.joeltherrien.randomforest.covariates.BooleanCovariateSettings;
+import ca.joeltherrien.randomforest.covariates.Covariate;
+import ca.joeltherrien.randomforest.covariates.FactorCovariateSettings;
+import ca.joeltherrien.randomforest.covariates.NumericCovariateSettings;
+import ca.joeltherrien.randomforest.responses.competingrisk.CompetingRiskErrorRateCalculator;
+import ca.joeltherrien.randomforest.responses.competingrisk.CompetingRiskFunctions;
+import ca.joeltherrien.randomforest.responses.competingrisk.CompetingRiskResponse;
+import ca.joeltherrien.randomforest.responses.competingrisk.CompetingRiskResponseWithCensorTime;
 import ca.joeltherrien.randomforest.responses.competingrisk.combiner.CompetingRiskFunctionCombiner;
 import ca.joeltherrien.randomforest.tree.Forest;
 import ca.joeltherrien.randomforest.tree.ForestTrainer;
@@ -12,7 +18,9 @@ import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.TextNode;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.List;
 
 public class Main {
diff --git a/src/main/java/ca/joeltherrien/randomforest/covariates/Covariate.java b/src/main/java/ca/joeltherrien/randomforest/covariates/Covariate.java
index 77f1f10..9fa77ef 100644
--- a/src/main/java/ca/joeltherrien/randomforest/covariates/Covariate.java
+++ b/src/main/java/ca/joeltherrien/randomforest/covariates/Covariate.java
@@ -5,7 +5,10 @@ import ca.joeltherrien.randomforest.Row;
 import ca.joeltherrien.randomforest.tree.Split;
 
 import java.io.Serializable;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 
 public interface Covariate<V> extends Serializable {
diff --git a/src/main/java/ca/joeltherrien/randomforest/responses/competingrisk/CompetingRiskFunctions.java b/src/main/java/ca/joeltherrien/randomforest/responses/competingrisk/CompetingRiskFunctions.java
index 56601c9..e137438 100644
--- a/src/main/java/ca/joeltherrien/randomforest/responses/competingrisk/CompetingRiskFunctions.java
+++ b/src/main/java/ca/joeltherrien/randomforest/responses/competingrisk/CompetingRiskFunctions.java
@@ -1,6 +1,6 @@
 package ca.joeltherrien.randomforest.responses.competingrisk;
 
-import ca.joeltherrien.randomforest.utils.StepFunction;
+import ca.joeltherrien.randomforest.utils.RightContinuousStepFunction;
 import lombok.Builder;
 import lombok.Getter;
 
@@ -10,22 +10,22 @@ import java.util.List;
 @Builder
 public class CompetingRiskFunctions implements Serializable {
 
-    private final List<StepFunction> causeSpecificHazards;
-    private final List<StepFunction> cumulativeIncidenceCurves;
+    private final List<RightContinuousStepFunction> causeSpecificHazards;
+    private final List<RightContinuousStepFunction> cumulativeIncidenceCurves;
 
     @Getter
-    private final StepFunction survivalCurve;
+    private final RightContinuousStepFunction survivalCurve;
 
-    public StepFunction getCauseSpecificHazardFunction(int cause){
+    public RightContinuousStepFunction getCauseSpecificHazardFunction(int cause){
         return causeSpecificHazards.get(cause-1);
     }
 
-    public StepFunction getCumulativeIncidenceFunction(int cause) {
+    public RightContinuousStepFunction getCumulativeIncidenceFunction(int cause) {
         return cumulativeIncidenceCurves.get(cause-1);
     }
 
     public double calculateEventSpecificMortality(final int event, final double tau){
-        final StepFunction cif = getCumulativeIncidenceFunction(event);
+        final RightContinuousStepFunction cif = getCumulativeIncidenceFunction(event);
 
         double summation = 0.0;
 
diff --git a/src/main/java/ca/joeltherrien/randomforest/responses/competingrisk/combiner/CompetingRiskFunctionCombiner.java b/src/main/java/ca/joeltherrien/randomforest/responses/competingrisk/combiner/CompetingRiskFunctionCombiner.java
index 7d928a6..14ab8b5 100644
--- a/src/main/java/ca/joeltherrien/randomforest/responses/competingrisk/combiner/CompetingRiskFunctionCombiner.java
+++ b/src/main/java/ca/joeltherrien/randomforest/responses/competingrisk/combiner/CompetingRiskFunctionCombiner.java
@@ -3,7 +3,6 @@ package ca.joeltherrien.randomforest.responses.competingrisk.combiner;
 import ca.joeltherrien.randomforest.responses.competingrisk.CompetingRiskFunctions;
 import ca.joeltherrien.randomforest.tree.ResponseCombiner;
 import ca.joeltherrien.randomforest.utils.RightContinuousStepFunction;
-import ca.joeltherrien.randomforest.utils.StepFunction;
 import lombok.RequiredArgsConstructor;
 
 import java.util.ArrayList;
@@ -50,10 +49,10 @@ public class CompetingRiskFunctionCombiner implements ResponseCombiner<Competing
                     .sum();
         }
 
-        final StepFunction survivalFunction = new RightContinuousStepFunction(timesToUse, survivalY, 1.0);
+        final RightContinuousStepFunction survivalFunction = new RightContinuousStepFunction(timesToUse, survivalY, 1.0);
 
-        final List<StepFunction> causeSpecificCumulativeHazardFunctionList = new ArrayList<>(events.length);
-        final List<StepFunction> cumulativeIncidenceFunctionList = new ArrayList<>(events.length);
+        final List<RightContinuousStepFunction> causeSpecificCumulativeHazardFunctionList = new ArrayList<>(events.length);
+        final List<RightContinuousStepFunction> cumulativeIncidenceFunctionList = new ArrayList<>(events.length);
 
         for(final int event : events){
 
diff --git a/src/main/java/ca/joeltherrien/randomforest/responses/competingrisk/combiner/CompetingRiskResponseCombiner.java b/src/main/java/ca/joeltherrien/randomforest/responses/competingrisk/combiner/CompetingRiskResponseCombiner.java
index 538245a..f23d270 100644
--- a/src/main/java/ca/joeltherrien/randomforest/responses/competingrisk/combiner/CompetingRiskResponseCombiner.java
+++ b/src/main/java/ca/joeltherrien/randomforest/responses/competingrisk/combiner/CompetingRiskResponseCombiner.java
@@ -5,9 +5,10 @@ import ca.joeltherrien.randomforest.responses.competingrisk.CompetingRiskRespons
 import ca.joeltherrien.randomforest.tree.ResponseCombiner;
 import ca.joeltherrien.randomforest.utils.Point;
 import ca.joeltherrien.randomforest.utils.RightContinuousStepFunction;
-import ca.joeltherrien.randomforest.utils.StepFunction;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * This class takes all of the observations in a terminal node and combines them to produce estimates of the cause-specific hazard function
@@ -38,8 +39,8 @@ public class CompetingRiskResponseCombiner implements ResponseCombiner<Competing
     @Override
     public CompetingRiskFunctions combine(List<CompetingRiskResponse> responses) {
 
-        final List<StepFunction> causeSpecificCumulativeHazardFunctionList = new ArrayList<>(events.length);
-        final List<StepFunction> cumulativeIncidenceFunctionList = new ArrayList<>(events.length);
+        final List<RightContinuousStepFunction> causeSpecificCumulativeHazardFunctionList = new ArrayList<>(events.length);
+        final List<RightContinuousStepFunction> cumulativeIncidenceFunctionList = new ArrayList<>(events.length);
 
         Collections.sort(responses, (y1, y2) -> {
             if(y1.getU() < y2.getU()){
@@ -97,7 +98,7 @@ public class CompetingRiskResponseCombiner implements ResponseCombiner<Competing
             }
 
         }
-        final StepFunction survivalCurve = RightContinuousStepFunction.constructFromPoints(survivalPoints, 1.0);
+        final RightContinuousStepFunction survivalCurve = RightContinuousStepFunction.constructFromPoints(survivalPoints, 1.0);
 
 
         for(final int event : events){
@@ -138,10 +139,10 @@ public class CompetingRiskResponseCombiner implements ResponseCombiner<Competing
 
             }
 
-            final StepFunction causeSpecificCumulativeHazardFunction = RightContinuousStepFunction.constructFromPoints(hazardFunctionPoints, 0.0);
+            final RightContinuousStepFunction causeSpecificCumulativeHazardFunction = RightContinuousStepFunction.constructFromPoints(hazardFunctionPoints, 0.0);
             causeSpecificCumulativeHazardFunctionList.add(event-1, causeSpecificCumulativeHazardFunction);
 
-            final StepFunction cifFunction = RightContinuousStepFunction.constructFromPoints(cifPoints, 0.0);
+            final RightContinuousStepFunction cifFunction = RightContinuousStepFunction.constructFromPoints(cifPoints, 0.0);
             cumulativeIncidenceFunctionList.add(event-1, cifFunction);
         }
 
diff --git a/src/main/java/ca/joeltherrien/randomforest/tree/SplitNode.java b/src/main/java/ca/joeltherrien/randomforest/tree/SplitNode.java
index 90d87e5..8837170 100644
--- a/src/main/java/ca/joeltherrien/randomforest/tree/SplitNode.java
+++ b/src/main/java/ca/joeltherrien/randomforest/tree/SplitNode.java
@@ -1,7 +1,7 @@
 package ca.joeltherrien.randomforest.tree;
 
-import ca.joeltherrien.randomforest.covariates.Covariate;
 import ca.joeltherrien.randomforest.CovariateRow;
+import ca.joeltherrien.randomforest.covariates.Covariate;
 import lombok.Builder;
 
 @Builder
diff --git a/src/main/java/ca/joeltherrien/randomforest/tree/TerminalNode.java b/src/main/java/ca/joeltherrien/randomforest/tree/TerminalNode.java
index 93bc61f..917c10d 100644
--- a/src/main/java/ca/joeltherrien/randomforest/tree/TerminalNode.java
+++ b/src/main/java/ca/joeltherrien/randomforest/tree/TerminalNode.java
@@ -1,7 +1,6 @@
 package ca.joeltherrien.randomforest.tree;
 
 import ca.joeltherrien.randomforest.CovariateRow;
-
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
diff --git a/src/main/java/ca/joeltherrien/randomforest/utils/RUtils.java b/src/main/java/ca/joeltherrien/randomforest/utils/RUtils.java
index 392425f..bc43b68 100644
--- a/src/main/java/ca/joeltherrien/randomforest/utils/RUtils.java
+++ b/src/main/java/ca/joeltherrien/randomforest/utils/RUtils.java
@@ -1,7 +1,6 @@
 package ca.joeltherrien.randomforest.utils;
 
 import java.io.*;
-import java.util.List;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
diff --git a/src/test/java/ca/joeltherrien/randomforest/competingrisk/TestCompetingRiskFunctions.java b/src/test/java/ca/joeltherrien/randomforest/competingrisk/TestCompetingRiskFunctions.java
index 7147f4c..3b82e76 100644
--- a/src/test/java/ca/joeltherrien/randomforest/competingrisk/TestCompetingRiskFunctions.java
+++ b/src/test/java/ca/joeltherrien/randomforest/competingrisk/TestCompetingRiskFunctions.java
@@ -4,7 +4,6 @@ import ca.joeltherrien.randomforest.TestUtils;
 import ca.joeltherrien.randomforest.responses.competingrisk.CompetingRiskFunctions;
 import ca.joeltherrien.randomforest.utils.Point;
 import ca.joeltherrien.randomforest.utils.RightContinuousStepFunction;
-import ca.joeltherrien.randomforest.utils.StepFunction;
 import ca.joeltherrien.randomforest.utils.Utils;
 import org.junit.jupiter.api.Test;
 
@@ -14,7 +13,7 @@ public class TestCompetingRiskFunctions {
 
     @Test
     public void testCalculateEventSpecificMortality(){
-        final StepFunction cif1 = RightContinuousStepFunction.constructFromPoints(
+        final RightContinuousStepFunction cif1 = RightContinuousStepFunction.constructFromPoints(
                 Utils.easyList(
                         new Point(1.0, 0.3),
                         new Point(1.5, 0.7),
@@ -23,10 +22,10 @@ public class TestCompetingRiskFunctions {
         );
 
         // not being used
-        final StepFunction chf1 = RightContinuousStepFunction.constructFromPoints(Collections.emptyList(), 0.0);
+        final RightContinuousStepFunction chf1 = RightContinuousStepFunction.constructFromPoints(Collections.emptyList(), 0.0);
 
         // not being used
-        final StepFunction km = RightContinuousStepFunction.constructFromPoints(Collections.emptyList(), 0.0);
+        final RightContinuousStepFunction km = RightContinuousStepFunction.constructFromPoints(Collections.emptyList(), 0.0);
 
         final CompetingRiskFunctions functions = CompetingRiskFunctions.builder()
                 .causeSpecificHazards(Collections.singletonList(chf1))