diff --git a/src/ModFile.hh b/src/ModFile.hh
index f15ccbd8ce80627dc7383ed03be9cee43d49512f..6b6d9c82083ffb352bf769b35538fbae992a7647 100644
--- a/src/ModFile.hh
+++ b/src/ModFile.hh
@@ -52,7 +52,7 @@ public:
   ExternalFunctionsTable external_functions_table;
   //! Numerical constants table
   NumericalConstants num_constants;
-  //! Var Model Table used for storing info about trend component models
+  //! Var Model Table used for storing info about VAR models
   VarModelTable var_model_table;
   //! Trend Component Model Table used for storing info about trend component models
   TrendComponentModelTable trend_component_model_table;
diff --git a/src/macro/MacroValue.hh b/src/macro/MacroValue.hh
index acb6447d84875508b11f61a5d3bdab6a7ff8d253..b696d15e253de88f416b43dddad8bbdfd840eb76 100644
--- a/src/macro/MacroValue.hh
+++ b/src/macro/MacroValue.hh
@@ -73,7 +73,7 @@ public:
   //! Less comparison
   /*! Returns an IntMV, equal to 0 or 1 */
   virtual shared_ptr<IntMV> is_less(const MacroValuePtr &mv) noexcept(false);
-  //! Greater comparision
+  //! Greater comparison
   /*! Returns an IntMV, equal to 0 or 1 */
   virtual shared_ptr<IntMV> is_greater(const MacroValuePtr &mv) noexcept(false);
   //! Less or equal comparison
@@ -202,7 +202,7 @@ public:
   shared_ptr<IntMV> is_equal(const MacroValuePtr &mv) override;
   //! Subscripting operator
   /*! Argument must be an ArrayMV<int>. Indexes begin at 1.
-    If argument is a one-element array, returns an IntMV or StringMV.
+    If argument is a one-element array, returns the corresponding array element.
     Otherwise returns an array. */
   MacroValuePtr subscript(const MacroValuePtr &mv) noexcept(false) override;
   //! Returns a string containing the concatenation of string representations of elements
@@ -236,9 +236,8 @@ public:
 
   shared_ptr<IntMV> is_equal(const MacroValuePtr &mv) override;
   //! Subscripting operator
-  /*! Argument must be an ArrayMV<int>. Indexes begin at 1. Returns a StringMV. */
+  /*! Argument must be an ArrayMV<int>. Indexes begin at 1. */
   MacroValuePtr subscript(const MacroValuePtr &mv) noexcept(false) override;
-  //! Returns underlying string value
   string toString() override;
   string print() override;
   shared_ptr<IntMV> length() noexcept(false) override;