diff --git a/src/Neighbor.cpp b/src/Neighbor.cpp
--- a/src/Neighbor.cpp
+++ b/src/Neighbor.cpp
@@ -2,12 +2,12 @@
  *
  *  This file is part of the Virtual Leaf.
  *
- *  The Virtual Leaf is free software: you can redistribute it and/or modify
+ *  VirtualLeaf is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  The Virtual Leaf is distributed in the hope that it will be useful,
+ *  VirtualLeaf is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
@@ -26,7 +26,7 @@
 static const std::string _module_id("$Id$");
 
 Neighbor::Neighbor(void):
-  cell(NULL), nb1(NULL), nb2(NULL){}
+  cell(0), nb1(0), nb2(0){}
 
 Neighbor::Neighbor(Cell *c, Node *n1, Node *n2):
   cell(c), nb1(n1), nb2(n2){}