diff --git a/DataStructures/NNGrid.h b/DataStructures/NNGrid.h
index c01f21e40..fae48dae9 100644
--- a/DataStructures/NNGrid.h
+++ b/DataStructures/NNGrid.h
@@ -261,7 +261,6 @@ public:
                 GetContentsOfFileBucket(fileIndex+i+j, candidates);
             }
         }
-
         _Coordinate tmp;
         double dist = numeric_limits<double>::max();
         timestamp = get_timestamp();
@@ -279,7 +278,6 @@ public:
                 routingStarts->startCoord.lon = tmp.lon;
             }
         }
-
         fileIndex = getFileIndexForLatLon(targetCoord.lat, targetCoord.lon);
         candidates.clear();
         timestamp = get_timestamp();
@@ -288,7 +286,6 @@ public:
                 GetContentsOfFileBucket(fileIndex+i+j, candidates);
             }
         }
-
         dist = numeric_limits<double>::max();
         timestamp = get_timestamp();
         for(std::vector<_Edge>::iterator it = candidates.begin(); it != candidates.end(); it++)
@@ -318,7 +315,6 @@ public:
                 GetContentsOfFileBucket(fileIndex+i+j, candidates);
             }
         }
-
         _Coordinate nearest(numeric_limits<int>::max(), numeric_limits<int>::max()), tmp;
         double dist = numeric_limits<double>::max();
         timestamp = get_timestamp();
@@ -510,6 +506,7 @@ private:
         {
             for(int j = 0; j < 32; j++)
             {
+                assert(cellMap->size() >= 0);
                 unsigned fileIndex = lineBase + i*32768 + columnBase+j;
                 unsigned cellIndex = i*32+j;
                 cellMap->insert(std::make_pair(fileIndex, cellIndex));
@@ -551,6 +548,7 @@ private:
             result.push_back(e);
             numberOfEdgesInFileBucket++;
         } while(true);
+
         delete cellMap;
     }
 
diff --git a/DataStructures/NodeInformationHelpDesk.h b/DataStructures/NodeInformationHelpDesk.h
index dd6ea3a43..1ea3929f2 100644
--- a/DataStructures/NodeInformationHelpDesk.h
+++ b/DataStructures/NodeInformationHelpDesk.h
@@ -54,7 +54,9 @@ public:
 
 	NodeID getNumberOfNodes() const { return numberOfNodes; }
 
-	inline void findNearestNodeCoordForLatLon(const _Coordinate coord, _Coordinate& result) { result = g->FindNearestPointOnEdge(coord); }
+	inline void findNearestNodeCoordForLatLon(const _Coordinate coord, _Coordinate& result) {
+	    result = g->FindNearestPointOnEdge(coord);
+	}
 
 	inline bool FindRoutingStarts(const _Coordinate start, const _Coordinate target, PhantomNodes * phantomNodes) {
 	    g->FindRoutingStarts(start, target, phantomNodes);
diff --git a/createHierarchy.cpp b/createHierarchy.cpp
index 9d5a90c64..6d49e1548 100644
--- a/createHierarchy.cpp
+++ b/createHierarchy.cpp
@@ -168,7 +168,6 @@ int main (int argc, char *argv[])
             middle = it->data.middleName.middle;
         else {
             middle = it->data.middleName.nameID;
-            assert (middle < 10000);
         }
 
         NodeID source = it->source;