diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/SolutionAcceptor.java b/jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/SolutionAcceptor.java
index 0996e03d..b47d913e 100644
--- a/jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/SolutionAcceptor.java
+++ b/jsprit-core/src/main/java/jsprit/core/algorithm/acceptor/SolutionAcceptor.java
@@ -39,7 +39,7 @@ public interface SolutionAcceptor {
 	 * 
 	 * @param solutions collection of existing solutions
 	 * @param newSolution new solution to be evaluated
-	 * @return TODO
+	 * @return true if solution accepted
 	 */
 	public boolean acceptSolution(Collection<VehicleRoutingProblemSolution> solutions, VehicleRoutingProblemSolution newSolution);
 
diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/DellAmicoFixCostCalculator.java b/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/DellAmicoFixCostCalculator.java
index 2809b113..95526692 100644
--- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/DellAmicoFixCostCalculator.java
+++ b/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/DellAmicoFixCostCalculator.java
@@ -43,7 +43,7 @@ public class DellAmicoFixCostCalculator implements SoftRouteConstraint, Insertio
 	}
 
 	@Override
-	public double getCosts(JobInsertionContext insertionContext) {// TODO Auto-generated method stub
+	public double getCosts(JobInsertionContext insertionContext) {
 		return calculator.getCosts(insertionContext);
 	}
 	
diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/Inserter.java b/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/Inserter.java
index 49efc4e7..2fd482e9 100644
--- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/Inserter.java
+++ b/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/Inserter.java
@@ -47,8 +47,7 @@ class Inserter {
 
 		@Override
 		public void setNextHandler(JobInsertionHandler handler) {
-			// TODO Auto-generated method stub
-			
+
 		}
 		
 	}
diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorBuilder.java b/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorBuilder.java
index 87379f89..32ba952b 100644
--- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorBuilder.java
+++ b/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorBuilder.java
@@ -112,7 +112,7 @@ public class JobInsertionCostsCalculatorBuilder {
 
 	/**
 	 * Sets activityStates. MUST be set.
-	 * @param stateManager TODO
+	 * @param stateManager
 	 * 
 	 * @return
 	 */
@@ -147,7 +147,7 @@ public class JobInsertionCostsCalculatorBuilder {
 	 * Sets a flag to build a calculator based on local calculations.
 	 * 
 	 * <p>Insertion of a job and job-activity is evaluated based on the previous and next activity.
-	 * @param addDefaultCostCalc TODO
+	 * @param addDefaultCostCalc
 	 */
 	public JobInsertionCostsCalculatorBuilder setLocalLevel(boolean addDefaultCostCalc){
 		local = true;
@@ -165,7 +165,7 @@ public class JobInsertionCostsCalculatorBuilder {
 	 * 
 	 * @param forwardLooking
 	 * @param memory
-	 * @param addDefaultMarginalCostCalc TODO
+	 * @param addDefaultMarginalCostCalc
 	 */
 	public JobInsertionCostsCalculatorBuilder setRouteLevel(int forwardLooking, int memory, boolean addDefaultMarginalCostCalc){
 		local = false;
diff --git a/jsprit-core/src/main/java/jsprit/core/problem/constraint/VehicleDependentTimeWindowConstraints.java b/jsprit-core/src/main/java/jsprit/core/problem/constraint/VehicleDependentTimeWindowConstraints.java
index b4ba95a7..b22c44c6 100644
--- a/jsprit-core/src/main/java/jsprit/core/problem/constraint/VehicleDependentTimeWindowConstraints.java
+++ b/jsprit-core/src/main/java/jsprit/core/problem/constraint/VehicleDependentTimeWindowConstraints.java
@@ -119,7 +119,7 @@ public class VehicleDependentTimeWindowConstraints implements HardActivityConstr
                                 routingCosts.getBackwardTransportTime(newAct.getLocation(),nextActLocation,latestArrTimeAtNextAct,iFacts.getNewDriver(),iFacts.getNewVehicle())
                                     - newAct.getOperationTime()
                 );
-//ToDo: SUSPICIOUS - hier muss noch operation time weg
+
 			/*
 			 *  |--- prevAct ---|
 			 *                       		                 |--- vehicle's arrival @newAct
diff --git a/jsprit-core/src/main/java/jsprit/core/problem/cost/VehicleRoutingActivityCosts.java b/jsprit-core/src/main/java/jsprit/core/problem/cost/VehicleRoutingActivityCosts.java
index cd043f37..786800c9 100644
--- a/jsprit-core/src/main/java/jsprit/core/problem/cost/VehicleRoutingActivityCosts.java
+++ b/jsprit-core/src/main/java/jsprit/core/problem/cost/VehicleRoutingActivityCosts.java
@@ -53,10 +53,9 @@ public interface VehicleRoutingActivityCosts {
 	 * @param tourAct
 	 * @param arrivalTime is actually the arrival time at this tourActivity, which must not nessecarrily be the operation start time. If the theoretical earliest
 	 * operation start time at this activity is later than actualStartTime, the driver must wait at this activity.
-	 * @param driver TODO
-	 * @param vehicle TODO
-	 * @param earliestStartTime, this is the practical earliest operation start time which considers also previous activities.
-	 * @param latestStartTime, this is the practical latest operation start time which consider also future activities in the tour. 
+	 * @param driver
+	 * @param vehicle
+	 *
 	 * if earliestStartTime > latestStartTime activity operations cannot be conducted within the given time-window.
 	 * @return
 	 */
diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT.java b/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT.java
index 1505cd25..5bc014bc 100644
--- a/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT.java
+++ b/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT.java
@@ -137,10 +137,8 @@ public class RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_IT {
 			readDemandQuantities(vrpBuilder);
 			readDistances(matrixBuilder);
 		} catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		} catch (IOException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 		
diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndDistanceCosts_IT.java b/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndDistanceCosts_IT.java
index 30b9d34b..d7d30071 100644
--- a/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndDistanceCosts_IT.java
+++ b/jsprit-core/src/test/java/jsprit/core/algorithm/RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndDistanceCosts_IT.java
@@ -137,10 +137,8 @@ public class RefuseCollectionWithCostsHigherThanTimesAndFiniteFleet_withTimeAndD
 			readDemandQuantities(vrpBuilder);
 			readDistances(matrixBuilder);
 		} catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		} catch (IOException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 		
diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/SearchStrategyTest.java b/jsprit-core/src/test/java/jsprit/core/algorithm/SearchStrategyTest.java
index bfa7a5a4..e6c1703c 100644
--- a/jsprit-core/src/test/java/jsprit/core/algorithm/SearchStrategyTest.java
+++ b/jsprit-core/src/test/java/jsprit/core/algorithm/SearchStrategyTest.java
@@ -72,15 +72,13 @@ public class SearchStrategyTest {
 
 			@Override
 			public String getName() {
-				// TODO Auto-generated method stub
 				return null;
 			}
 
 			@Override
 			public void addModuleListener(
 					SearchStrategyModuleListener moduleListener) {
-				// TODO Auto-generated method stub
-				
+
 			}
 		};
 		strat.addModule(mod);
@@ -114,15 +112,13 @@ public class SearchStrategyTest {
 
 			@Override
 			public String getName() {
-				// TODO Auto-generated method stub
 				return null;
 			}
 
 			@Override
 			public void addModuleListener(
 					SearchStrategyModuleListener moduleListener) {
-				// TODO Auto-generated method stub
-				
+
 			}
 		};
 		SearchStrategyModule mod2 = new SearchStrategyModule() {
@@ -135,15 +131,13 @@ public class SearchStrategyTest {
 
 			@Override
 			public String getName() {
-				// TODO Auto-generated method stub
 				return null;
 			}
 
 			@Override
 			public void addModuleListener(
 					SearchStrategyModuleListener moduleListener) {
-				// TODO Auto-generated method stub
-				
+
 			}
 		};
 		strat.addModule(mod);
@@ -181,15 +175,13 @@ public class SearchStrategyTest {
 
 				@Override
 				public String getName() {
-					// TODO Auto-generated method stub
 					return null;
 				}
 
 				@Override
 				public void addModuleListener(
 						SearchStrategyModuleListener moduleListener) {
-					// TODO Auto-generated method stub
-					
+
 				}
 			};
 			strat.addModule(mod);
@@ -225,15 +217,13 @@ public class SearchStrategyTest {
 
 				@Override
 				public String getName() {
-					// TODO Auto-generated method stub
 					return null;
 				}
 
 				@Override
 				public void addModuleListener(
 						SearchStrategyModuleListener moduleListener) {
-					// TODO Auto-generated method stub
-					
+
 				}
 			};
 			strat.addModule(mod);
diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/io/TestAlgorithmReader.java b/jsprit-core/src/test/java/jsprit/core/algorithm/io/TestAlgorithmReader.java
index 2ea0ba3f..8c84a37f 100644
--- a/jsprit-core/src/test/java/jsprit/core/algorithm/io/TestAlgorithmReader.java
+++ b/jsprit-core/src/test/java/jsprit/core/algorithm/io/TestAlgorithmReader.java
@@ -191,32 +191,27 @@ public class TestAlgorithmReader {
 
 			@Override
 			public Collection<Job> ruin(Collection<VehicleRoute> vehicleRoutes) {
-				// TODO Auto-generated method stub
 				return null;
 			}
 
 			@Override
 			public Collection<Job> ruin(Collection<VehicleRoute> vehicleRoutes,
 					Job targetJob, int nOfJobs2BeRemoved) {
-				// TODO Auto-generated method stub
 				return null;
 			}
 
 			@Override
 			public void addListener(RuinListener ruinListener) {
-				// TODO Auto-generated method stub
-				
+
 			}
 
 			@Override
 			public void removeListener(RuinListener ruinListener) {
-				// TODO Auto-generated method stub
-				
+
 			}
 
 			@Override
 			public Collection<RuinListener> getListeners() {
-				// TODO Auto-generated method stub
 				return null;
 			}
 			
@@ -232,17 +227,15 @@ public class TestAlgorithmReader {
 
 			@Override
 			public String getName() {
-				// TODO Auto-generated method stub
 				return null;
 			}
 
 			@Override
 			public void addModuleListener(
 					SearchStrategyModuleListener moduleListener) {
-				// TODO Auto-generated method stub
-				
+
 			}
-		};;;
+		};
 		
 		typedMap.put(accKey, acceptor);
 		typedMap.put(moduleKey, stratModule);
diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/ruin/distance/TestJobDistanceAvgCosts.java b/jsprit-core/src/test/java/jsprit/core/algorithm/ruin/distance/TestJobDistanceAvgCosts.java
index f4e629b2..5953bb1f 100644
--- a/jsprit-core/src/test/java/jsprit/core/algorithm/ruin/distance/TestJobDistanceAvgCosts.java
+++ b/jsprit-core/src/test/java/jsprit/core/algorithm/ruin/distance/TestJobDistanceAvgCosts.java
@@ -38,7 +38,6 @@ public class TestJobDistanceAvgCosts {
 			@Override
 			public double getBackwardTransportCost(Location from, Location to,
 					double arrivalTime, Driver driver, Vehicle vehicle) {
-				// TODO Auto-generated method stub
 				return 0;
 			}
 			
@@ -53,7 +52,6 @@ public class TestJobDistanceAvgCosts {
 			@Override
 			public double getTransportTime(Location from, Location to,
 					double departureTime, Driver driver, Vehicle vehicle) {
-				// TODO Auto-generated method stub
 				return 0;
 			}
 		};
@@ -75,7 +73,6 @@ public class TestJobDistanceAvgCosts {
 			@Override
 			public double getBackwardTransportCost(Location from, Location to,
 					double arrivalTime, Driver driver, Vehicle vehicle) {
-				// TODO Auto-generated method stub
 				return 0;
 			}
 			
@@ -90,7 +87,6 @@ public class TestJobDistanceAvgCosts {
 			@Override
 			public double getTransportTime(Location from, Location to,
 					double departureTime, Driver driver, Vehicle vehicle) {
-				// TODO Auto-generated method stub
 				return 0;
 			}
 		};
diff --git a/jsprit-instances/src/main/java/jsprit/instance/reader/LiLimReader.java b/jsprit-instances/src/main/java/jsprit/instance/reader/LiLimReader.java
index 1b8285d9..5044cceb 100644
--- a/jsprit-instances/src/main/java/jsprit/instance/reader/LiLimReader.java
+++ b/jsprit-instances/src/main/java/jsprit/instance/reader/LiLimReader.java
@@ -22,11 +22,9 @@ import jsprit.core.problem.VehicleRoutingProblem;
 import jsprit.core.problem.VehicleRoutingProblem.Builder;
 import jsprit.core.problem.job.Shipment;
 import jsprit.core.problem.solution.route.activity.TimeWindow;
-import jsprit.core.problem.vehicle.Vehicle;
 import jsprit.core.problem.vehicle.VehicleImpl;
 import jsprit.core.problem.vehicle.VehicleTypeImpl;
 import jsprit.core.util.Coordinate;
-import jsprit.core.util.Locations;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -186,7 +184,6 @@ public class LiLimReader {
 			}
 			reader.close();
 		} catch (IOException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 		
diff --git a/jsprit-instances/src/main/java/jsprit/instance/reader/TSPLIB95Reader.java b/jsprit-instances/src/main/java/jsprit/instance/reader/TSPLIB95Reader.java
index 699af4be..7d185284 100644
--- a/jsprit-instances/src/main/java/jsprit/instance/reader/TSPLIB95Reader.java
+++ b/jsprit-instances/src/main/java/jsprit/instance/reader/TSPLIB95Reader.java
@@ -46,7 +46,7 @@ public class TSPLIB95Reader {
 
     public void read(String filename){
         BufferedReader reader = getBufferedReader(filename);
-        String line;
+        String line_;
         Coordinate[] coords = null;
         int[] demands = null;
         Integer capacity = null;
@@ -61,7 +61,8 @@ public class TSPLIB95Reader {
         int dimensions = 0;
         int coordIndex = 0;
         Map<Integer,Integer> indexMap = new HashMap<Integer, Integer>();
-        while( ( line = getLine(reader) ) != null ){
+        while( ( line_ = getLine(reader) ) != null ){
+            String line = line_.trim();
             if(line.startsWith("EOF") || line.contains("EOF")){
                 break;
             }
diff --git a/jsprit-instances/src/main/java/jsprit/instance/util/Instances.java b/jsprit-instances/src/main/java/jsprit/instance/util/Instances.java
index 4edc9d32..e227a041 100644
--- a/jsprit-instances/src/main/java/jsprit/instance/util/Instances.java
+++ b/jsprit-instances/src/main/java/jsprit/instance/util/Instances.java
@@ -61,10 +61,8 @@ public class Instances {
 			reader.close();
 			return result;
 		} catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		} catch (IOException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 		return 0;
@@ -79,7 +77,7 @@ public class Instances {
 	 * Returns a collection of {@link BenchmarkInstance} which are Cordeau's pr instances.
 	 * <p>Note that this assumes that within the folder 'inputFolder' 10 p-instances are located with their original name, i.e. pr01,pr02,...,pr10.
 	 * <p>It also assumes that solution files are also located in inputFolder ending with .res
-	 * @param inputFolder TODO
+	 * @param inputFolder
 	 * @param inputFolder where cordeau's pr instances are located. It must end without '/' such as instances/cordeau.
 	 * 
 	 * @return a collection of {@link BenchmarkInstance}
@@ -185,7 +183,7 @@ public class Instances {
 	 * Returns a collection of {@link BenchmarkInstance} which are Solomon instances.
 	 * <p>Note that this assumes that within the folder 'inputFolder' 11 R1-instances are located with their original name, i.e. R201.txt,R202.txt,...,R111.txt.
 	 * <p>Note that unlike the original problems, a fixed-cost value of 1000 is set for each employed vehicle.
-	 * @param inputFolder TODO
+	 * @param inputFolder
 	 * @param inputFolder where solomon R2 instances are located. It must end without '/' such as instances/solomon.
 	 * @return a collection of {@link BenchmarkInstance}
 	 */
@@ -228,7 +226,7 @@ public class Instances {
 	 * Returns a collection of {@link BenchmarkInstance} which are Solomon instances.
 	 * <p>Note that this assumes that within the folder 'inputFolder' 8 RC2-instances are located with their original name, i.e. RC201.txt,RC202.txt,...,RC208.txt.
 	 * <p>Note that unlike the original problems, a fixed-cost value of 1000 is set for each employed vehicle.
-	 * @param inputFolder TODO
+	 * @param inputFolder
 	 * @param inputFolder where solomon RC2 instances are located. It must end without '/' such as instances/solomon.
 	 * @return a collection of {@link BenchmarkInstance}
 	 */