@@ -1,12 +1,10 @@
-/*
-# const
-
-    There are differences between the `const` keyword in C and C++.
-
-    Also, in C++ const can be used to qualify methods.
-
-    http://stackoverflow.com/questions/8908071/const-correctness-in-c-vs-c
-*/
+// # const
+//
+// There are differences between the `const` keyword in C and C++.
+//
+// Also, in C++ const can be used to qualify methods.
+//
+// http://stackoverflow.com/questions/8908071/const-correctness-in-c-vs-c
 
 #include "common.hpp"
 
@@ -18,11 +16,9 @@ class Class {
 };
 
 int main() {
-    /*
-    In C++, consts cannot be changed not even through pointers.
-
-    C this is only a warning, and allows us to change ic.
-    */
+    // In C++, consts cannot be changed not even through pointers.
+    //
+    // In C this is only a warning, and allows us to change ic.
     {
         const int i = 2;
         //int* ip = i;
@@ -52,37 +48,31 @@ int main() {
             //*icp = 1;
         }
 
-        // C is initialized by the constructor
-        // so it is OK to do this unlike for base types
+        // C is initialized by the constructor so it is OK to do this
+        // without an assignment unlike for base types
         const Class c;
     }
 
     // Const for classes.
     {
         const Class c;
 
-        // Cannot reassign:
-
-            //cc = Class();
-
-        // Cannot assign members:
-
-            //cc.i = 1;
-
-        // Can create const refs to:
-
-            const int& cia = c.i;
+        // Cannot reassign.
+        //cc = Class();
 
-        // Cannot create non const refs:
+        // Cannot assign members.
+        //cc.i = 1;
 
-            //int& ia = cc.i;
+        // Can create const refs to.
+        const int& cia = c.i;
 
-        /*
-        Can only call const methods,
-        because a non const method could change the object.
+        // Cannot create non const refs.
+        //int& ia = cc.i;
 
-        Therefore, *BE CONST OBSESSIVE!* mark as const every method that does not change the object!
-        */
+        // Can only call const methods,
+        // because a non const method could change the object.
+        //
+        // Therefore, *BE CONST OBSESSIVE!* mark as const every method that does not change the object!
         {
             //c.method();
             c.constMethod();
 
@@ -116,6 +116,7 @@ int main() {
 
         auto found = m.find(0);
         assert(found != m.end());
+        assert(found->first == 0);
         assert(found->second == "zero");
 
         assert(m.find(2) == m.end());
 
@@ -1,12 +1,11 @@
-/*
-# pair
-
-    Particular case of tuple for two elements (TODO inheritance based?).
-
-    Methods which also exist for tuple will not be discussed.
-
-    Specially important because of `map`.
-*/
+// # pair
+//
+// Particular case of tuple for two elements (TODO inheritance based?).
+//
+// Methods which also exist for tuple will not be discussed.
+//
+// Specially important because of `map`, for which find() for example
+// returns key value tuples.
 
 #include "common.hpp"
 
@@ -23,30 +22,26 @@ int main() {
         assert(std::get<1>(p) == p.second);
     }
 
-    /*
-    make_pair
-
-        Saves re-typing the types on the constructor.
-
-        http://stackoverflow.com/questions/9270563/what-is-the-purpose-of-stdmake-pair-vs-the-constructor-of-stdpair/41521422#41521422
-    */
+    // # make_pair
+    //
+    // Saves re-typing the types on the constructor.
+    //
+    // http://stackoverflow.com/questions/9270563/what-is-the-purpose-of-stdmake-pair-vs-the-constructor-of-stdpair/41521422#41521422
     {
         auto p = my_make_pair(1, std::string("one"));
         assert(p.first == 1);
         assert(p.second == "one");
         p = std::make_pair(1, "asdf");
     }
 
-    /*
-    # Relational operators
-
-        Lexicographical.
-
-        http://stackoverflow.com/questions/2819245/is-stdpairint-stdstring-ordering-well-defined
-    */
+    // # Relational operators
+    //
+    // Lexicographical.
+    //
+    // http://stackoverflow.com/questions/2819245/is-stdpairint-stdstring-ordering-well-defined
     {
         assert(std::make_pair(1, 1) == std::make_pair(1, 1));
-        assert(std::make_pair(1, 2) < std::make_pair(2, 1));
-        assert(std::make_pair(2, 1) > std::make_pair(1, 2));
+        assert(std::make_pair(1, 2) <  std::make_pair(2, 1));
+        assert(std::make_pair(2, 1) >  std::make_pair(1, 2));
     }
 }