diff --git a/CIValidations/SplineValidations.cpp b/CIValidations/SplineValidations.cpp
index a5ef0a2..802a16f 100755
--- a/CIValidations/SplineValidations.cpp
+++ b/CIValidations/SplineValidations.cpp
@@ -92,7 +92,7 @@ void SplineBinnedValidations(std::ostream& outFile){
   constexpr int ModeIndex = 0;
   std::vector<double> TrueEnu = {0.2, 0.4, 0.6, 0.8, 1.0};
   for (size_t iEnu = 0; iEnu < TrueEnu.size(); ++iEnu) {
-    auto EventSplines = SplineHandler->GetEventSplines("FHC_1Re", OscIndex, ModeIndex, TrueEnu[iEnu], TrueEnu[iEnu], 0.);
+    auto EventSplines = SplineHandler->GetEventSplines("FHC_1Re", OscIndex, ModeIndex, {TrueEnu[iEnu], TrueEnu[iEnu], 0.});
 
     for(size_t spline = 0; spline < EventSplines.size(); spline++) {
       //Event Splines indexed as: sample name, oscillation channel, syst, mode, etrue, var1, var2 (var2 is a dummy 0 for 1D splines)
diff --git a/SplinesTutorial/BinnedSplinesTutorial.cpp b/SplinesTutorial/BinnedSplinesTutorial.cpp
index 32658db..899e7c6 100644
--- a/SplinesTutorial/BinnedSplinesTutorial.cpp
+++ b/SplinesTutorial/BinnedSplinesTutorial.cpp
@@ -9,13 +9,12 @@ BinnedSplineTutorial::~BinnedSplineTutorial() {
 }
 
 std::vector<std::string> BinnedSplineTutorial::GetTokensFromSplineName(const std::string& FullSplineName) {
-  std::vector<std::string> ReturnVec(TokenOrdering::kNTokens);
+  std::vector<std::string> ReturnVec(5);
 
   TObjArray *tokens = TString(FullSplineName).Tokenize(".");
-  /*
-    A little hacky but lets us grab both old + new splines
-  */
-  if(tokens->GetEntries()!=7){
+
+  /// A little hacky but lets us grab both old + new splines
+  if(tokens->GetEntries() != 7){
     delete tokens;
     tokens = TString(FullSplineName).Tokenize("_");
   }
@@ -23,12 +22,12 @@ std::vector<std::string> BinnedSplineTutorial::GetTokensFromSplineName(const std
   ReturnVec[TokenOrdering::kSystToken] = (static_cast<TObjString*>(tokens->At(1)))->GetString();
   ReturnVec[TokenOrdering::kModeToken] = (static_cast<TObjString*>(tokens->At(2)))->GetString();
   // Skip 3 because it's "sp"
-  ReturnVec[TokenOrdering::kVar1BinToken] = (static_cast<TObjString*>(tokens->At(4)))->GetString();
-  ReturnVec[TokenOrdering::kVar2BinToken] = (static_cast<TObjString*>(tokens->At(5)))->GetString();
-  ReturnVec[TokenOrdering::kVar3BinToken] = "0";
+  ReturnVec[TokenOrdering::kVarBinToken + 0] = (static_cast<TObjString*>(tokens->At(4)))->GetString();
+  ReturnVec[TokenOrdering::kVarBinToken + 1] = (static_cast<TObjString*>(tokens->At(5)))->GetString();
+  ReturnVec[TokenOrdering::kVarBinToken + 2] = "0";
   
   if (tokens->GetEntries() == 7) {
-    ReturnVec[TokenOrdering::kVar3BinToken] = (static_cast<TObjString*>(tokens->At(6)))->GetString();
+    ReturnVec[TokenOrdering::kVarBinToken + 2] = (static_cast<TObjString*>(tokens->At(6)))->GetString();
   }
   tokens->Delete();
   delete tokens;
diff --git a/SplinesTutorial/BinnedSplinesTutorial.h b/SplinesTutorial/BinnedSplinesTutorial.h
index 22a64be..7d18d1f 100644
--- a/SplinesTutorial/BinnedSplinesTutorial.h
+++ b/SplinesTutorial/BinnedSplinesTutorial.h
@@ -10,5 +10,5 @@ class BinnedSplineTutorial : public BinnedSplineHandler
   BinnedSplineTutorial(ParameterHandlerGeneric *parameter_handler, MaCh3Modes *Modes);
   virtual ~BinnedSplineTutorial();
   
-  std::vector<std::string> GetTokensFromSplineName(const std::string& FullSplineName) override final;
+  std::vector<std::string> GetTokensFromSplineName(const std::string& FullSplineName) final;
 };