diff --git a/src/nt_storage.cpp b/src/nt_storage.cpp
index 5d521cd335..f2efc9b36d 100644
--- a/src/nt_storage.cpp
+++ b/src/nt_storage.cpp
@@ -9,7 +9,7 @@
 
 using namespace NtImpl;
 
-Storage* Storage::m_instance = 0;
+Storage* Storage::m_instance = nullptr;
 
 Storage::Storage()
 {
diff --git a/src/nt_utility.cpp b/src/nt_utility.cpp
index 3f92a37b7f..ecc7309095 100644
--- a/src/nt_utility.cpp
+++ b/src/nt_utility.cpp
@@ -55,14 +55,14 @@ void
 NT_DisposeString(NT_String *str)
 {
     std::free(str->str);
-    str->str = 0;
+    str->str = nullptr;
     str->len = 0;
 }
 
 void
 NT_InitString(NT_String *str)
 {
-    str->str = 0;
+    str->str = nullptr;
     str->len = 0;
 }
 
diff --git a/src/nt_value.cpp b/src/nt_value.cpp
index 63cbd1115b..b308cce45a 100644
--- a/src/nt_value.cpp
+++ b/src/nt_value.cpp
@@ -16,11 +16,11 @@ bool
 operator== (const NT_Value& lhs, const NT_Value& rhs)
 {
     if (lhs.type != rhs.type)
-        return 0;
+        return false;
     switch (lhs.type)
     {
     case NT_UNASSIGNED:
-        return 1; // XXX: is this better being false instead?
+        return true; // XXX: is this better being false instead?
     case NT_BOOLEAN:
         return lhs.data.v_boolean == rhs.data.v_boolean;
     case NT_DOUBLE:
@@ -29,39 +29,39 @@ operator== (const NT_Value& lhs, const NT_Value& rhs)
     case NT_RAW:
     case NT_RPC:
         if (lhs.data.v_string.len != rhs.data.v_string.len)
-            return 0;
+            return false;
         return std::memcmp(lhs.data.v_string.str, rhs.data.v_string.str,
                            lhs.data.v_string.len) == 0;
     case NT_BOOLEAN_ARRAY:
         if (lhs.data.arr_boolean.size != rhs.data.arr_boolean.size)
-            return 0;
+            return false;
         return std::memcmp(lhs.data.arr_boolean.arr, rhs.data.arr_boolean.arr,
                            lhs.data.arr_boolean.size *
                            sizeof(lhs.data.arr_boolean.arr[0])) == 0;
     case NT_DOUBLE_ARRAY:
         if (lhs.data.arr_double.size != rhs.data.arr_double.size)
-            return 0;
+            return false;
         return std::memcmp(lhs.data.arr_double.arr, rhs.data.arr_double.arr,
                            lhs.data.arr_double.size *
                            sizeof(lhs.data.arr_double.arr[0])) == 0;
     case NT_STRING_ARRAY:
     {
         if (lhs.data.arr_string.size != rhs.data.arr_string.size)
-            return 0;
+            return false;
         for (size_t i=0; i<lhs.data.arr_string.size; i++)
         {
             if (lhs.data.arr_string.arr[i].len !=
                 rhs.data.arr_string.arr[i].len)
-                return 0;
+                return false;
             if (std::memcmp(lhs.data.arr_string.arr[i].str,
                             rhs.data.arr_string.arr[i].str,
                             lhs.data.arr_string.arr[i].len) != 0)
-                return 0;
+                return false;
         }
-        return 1;
+        return true;
     }
     default:
-        /*assert(0 && "unknown value type");*/
-        return 0;
+        //assert(false && "unknown value type");
+        return false;
     }
 }
diff --git a/src/nt_wiredecoder.cpp b/src/nt_wiredecoder.cpp
index af357cc120..6ada62ca2b 100644
--- a/src/nt_wiredecoder.cpp
+++ b/src/nt_wiredecoder.cpp
@@ -38,7 +38,7 @@ WireDecoder::WireDecoder(raw_istream& is, unsigned int proto_rev)
     m_allocated = 1024;
     m_buf = (char*)std::malloc(m_allocated);
     m_proto_rev = proto_rev;
-    m_error = 0;
+    m_error = nullptr;
 }
 
 WireDecoder::~WireDecoder()
@@ -49,7 +49,7 @@ WireDecoder::~WireDecoder()
 bool
 WireDecoder::ReadDouble(double* val)
 {
-    char *buf;
+    char* buf;
     if (!Read(&buf, 8)) return false;
     *val = read_double(buf);
     return true;
diff --git a/src/nt_wiredecoder.h b/src/nt_wiredecoder.h
index 99894a15d7..71f65104fd 100644
--- a/src/nt_wiredecoder.h
+++ b/src/nt_wiredecoder.h
@@ -29,7 +29,7 @@ public:
 
     void Reset()
     {
-        m_error = 0;
+        m_error = nullptr;
     }
 
     const char* GetError() const
diff --git a/src/nt_wireencoder.cpp b/src/nt_wireencoder.cpp
index 0a3b6b1bbc..989b6a0883 100644
--- a/src/nt_wireencoder.cpp
+++ b/src/nt_wireencoder.cpp
@@ -22,7 +22,7 @@ WireEncoder::WireEncoder(unsigned int proto_rev)
     m_start = m_cur = (char *)std::malloc(1024);
     m_end = m_start + 1024;
     m_proto_rev = proto_rev;
-    m_error = 0;
+    m_error = nullptr;
 }
 
 WireEncoder::~WireEncoder()
diff --git a/src/nt_wireencoder.h b/src/nt_wireencoder.h
index 19f3b80096..e11e2159bb 100644
--- a/src/nt_wireencoder.h
+++ b/src/nt_wireencoder.h
@@ -29,7 +29,7 @@ public:
     void Reset()
     {
         m_cur = m_start;
-        m_error = 0;
+        m_error = nullptr;
     }
 
     const char* GetError() const