diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.C b/src/OpenFOAM/primitives/Scalar/Scalar.C
index 4445a52767..f3ac20b7b9 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.C
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.C
@@ -60,7 +60,7 @@ word name(const Scalar val)
 Scalar readScalar(Istream& is)
 {
     Scalar rs;
-    is >> rs;
+    is  >> rs;
 
     return rs;
 }
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.H b/src/OpenFOAM/primitives/Scalar/Scalar.H
index 69961ab2cc..4c818be7c4 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.H
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.H
@@ -50,9 +50,9 @@ public:
 
         enum
         {
-            dim = 3,         // Dimensionality of space
-            rank = 0,        // Rank of Scalar is 0
-            nComponents = 1  // Number of components in Scalar is 1
+            dim = 3,         //!< Dimensionality of space
+            rank = 0,        //!< Rank of Scalar is 0
+            nComponents = 1  //!< Number of components in Scalar is 1
         };
 
     // Static data members
@@ -72,6 +72,7 @@ public:
 
     // Member Functions
 
+        //- Conversion to a Scalar
         operator Scalar() const
         {
             return p_;
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
index 31e5b84f4a..79d0b8cedf 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
@@ -86,8 +86,8 @@ public:
 
         enum
         {
-            dim = 3,            // Dimensionality of space
-            nComponents = nCmpt // Number of components in this vector space
+            dim = 3,            //!< Dimensionality of space
+            nComponents = nCmpt //!< Number of components in this vector space
         };
 
 
diff --git a/src/OpenFOAM/primitives/bools/bool/bool.H b/src/OpenFOAM/primitives/bools/bool/bool.H
index 73b0701e0a..78d8f58f93 100644
--- a/src/OpenFOAM/primitives/bools/bool/bool.H
+++ b/src/OpenFOAM/primitives/bools/bool/bool.H
@@ -76,9 +76,9 @@ public:
 
         enum
         {
-            dim = 3,         // Dimensionality of space
-            rank = 0,        // Rank of bool is 0
-            nComponents = 1  // Number of components in bool is 1
+            dim = 3,         //!< Dimensionality of space
+            rank = 0,        //!< Rank of bool is 0
+            nComponents = 1  //!< Number of components in bool is 1
         };
 
     // Static data members
@@ -95,6 +95,7 @@ public:
 
     // Member Functions
 
+        //- Conversion to a bool
         operator bool() const
         {
             return p_;
diff --git a/src/OpenFOAM/primitives/ints/label/label.H b/src/OpenFOAM/primitives/ints/label/label.H
index cd15e9ea8b..c81d823241 100644
--- a/src/OpenFOAM/primitives/ints/label/label.H
+++ b/src/OpenFOAM/primitives/ints/label/label.H
@@ -148,9 +148,9 @@ public:
 
         enum
         {
-            dim = 3,         // Dimensionality of space
-            rank = 0,        // Rank of label is 0
-            nComponents = 1  // Number of components in label is 1
+            dim = 3,         //!< Dimensionality of space
+            rank = 0,        //!< Rank of label is 0
+            nComponents = 1  //!< Number of components in label is 1
         };
 
     // Static data members
@@ -169,6 +169,7 @@ public:
 
     // Member Functions
 
+        //- Conversion to a label
         operator label() const
         {
             return p_;
diff --git a/src/OpenFOAM/primitives/ints/uLabel/uLabel.H b/src/OpenFOAM/primitives/ints/uLabel/uLabel.H
index 2851ee75dd..23115fe99f 100644
--- a/src/OpenFOAM/primitives/ints/uLabel/uLabel.H
+++ b/src/OpenFOAM/primitives/ints/uLabel/uLabel.H
@@ -132,9 +132,9 @@ public:
 
         enum
         {
-            dim = 3,         // Dimensionality of space
-            rank = 0,        // Rank of uLabel is 0
-            nComponents = 1  // Number of components in uLabel is 1
+            dim = 3,         //!< Dimensionality of space
+            rank = 0,        //!< Rank of uLabel is 0
+            nComponents = 1  //!< Number of components in uLabel is 1
         };
 
     // Static data members
@@ -154,6 +154,7 @@ public:
 
     // Member Functions
 
+        //- Conversion to a uLabel
         operator uLabel() const
         {
             return p_;