diff --git a/lib/check.h b/lib/check.h
index 997123672..ec6a45d31 100644
--- a/lib/check.h
+++ b/lib/check.h
@@ -45,7 +45,7 @@ public:
         instances().sort();
     }
 
-    /** This constructor is used when running checks.. */
+    /** This constructor is used when running checks. */
     Check(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
             : _tokenizer(tokenizer), _settings(settings), _errorLogger(errorLogger)
     { }
diff --git a/lib/checkautovariables.h b/lib/checkautovariables.h
index e6baa9102..ef958863e 100644
--- a/lib/checkautovariables.h
+++ b/lib/checkautovariables.h
@@ -37,7 +37,7 @@ public:
     CheckAutoVariables() : Check()
     { }
 
-    /** This constructor is used when running checks.. */
+    /** This constructor is used when running checks. */
     CheckAutoVariables(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
             : Check(tokenizer, settings, errorLogger)
     { }
diff --git a/lib/checkbufferoverrun.h b/lib/checkbufferoverrun.h
index 2c7a70c03..67d5e0ac3 100644
--- a/lib/checkbufferoverrun.h
+++ b/lib/checkbufferoverrun.h
@@ -52,7 +52,7 @@ public:
     CheckBufferOverrun() : Check()
     { }
 
-    /** This constructor is used when running checks.. */
+    /** This constructor is used when running checks. */
     CheckBufferOverrun(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
             : Check(tokenizer, settings, errorLogger)
     { }
diff --git a/lib/checkclass.h b/lib/checkclass.h
index cd91ddc3e..d3908bcd1 100644
--- a/lib/checkclass.h
+++ b/lib/checkclass.h
@@ -38,7 +38,7 @@ public:
     CheckClass() : Check()
     { }
 
-    /** @brief This constructor is used when running checks.. */
+    /** @brief This constructor is used when running checks. */
     CheckClass(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
             : Check(tokenizer, settings, errorLogger)
     { }
@@ -90,7 +90,7 @@ public:
      */
     void noMemset();
 
-    /** @brief 'operator=' should return something.. */
+    /** @brief 'operator=' should return something. */
     void operatorEq();
 
     /** @brief 'operator=' should return reference to *this */
diff --git a/lib/checkdangerousfunctions.h b/lib/checkdangerousfunctions.h
index fe93357ce..7f74cbcd6 100644
--- a/lib/checkdangerousfunctions.h
+++ b/lib/checkdangerousfunctions.h
@@ -38,7 +38,7 @@ public:
     CheckDangerousFunctions() : Check()
     { }
 
-    /** This constructor is used when running checks.. */
+    /** This constructor is used when running checks. */
     CheckDangerousFunctions(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
             : Check(tokenizer, settings, errorLogger)
     { }
diff --git a/lib/checkexceptionsafety.h b/lib/checkexceptionsafety.h
index 1a30c136a..dec5fcb42 100644
--- a/lib/checkexceptionsafety.h
+++ b/lib/checkexceptionsafety.h
@@ -46,7 +46,7 @@ public:
     CheckExceptionSafety() : Check()
     { }
 
-    /** This constructor is used when running checks.. */
+    /** This constructor is used when running checks. */
     CheckExceptionSafety(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
             : Check(tokenizer, settings, errorLogger)
     { }
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
index ad72e0c08..17620baa0 100644
--- a/lib/checkother.cpp
+++ b/lib/checkother.cpp
@@ -1741,7 +1741,7 @@ private:
     }
 
 
-    /** Initialize an array with strncpy.. */
+    /** Initialize an array with strncpy. */
     static void init_strncpy(std::list<ExecutionPath *> &checks, const Token *tok)
     {
         const unsigned int varid(tok->varId());
diff --git a/lib/checkother.h b/lib/checkother.h
index 178296741..a9546edb2 100644
--- a/lib/checkother.h
+++ b/lib/checkother.h
@@ -40,7 +40,7 @@ public:
     CheckOther() : Check()
     { }
 
-    /** @brief This constructor is used when running checks.. */
+    /** @brief This constructor is used when running checks. */
     CheckOther(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
             : Check(tokenizer, settings, errorLogger)
     { }
diff --git a/lib/checkstl.h b/lib/checkstl.h
index aa8b4e822..ec049fcf8 100644
--- a/lib/checkstl.h
+++ b/lib/checkstl.h
@@ -38,7 +38,7 @@ public:
     CheckStl() : Check()
     { }
 
-    /** This constructor is used when running checks.. */
+    /** This constructor is used when running checks. */
     CheckStl(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
             : Check(tokenizer, settings, errorLogger)
     { }
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 199f8fbe9..e579f8013 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -1281,7 +1281,7 @@ bool Tokenizer::tokenize(std::istream &code, const char FileName[], const std::s
 }
 //---------------------------------------------------------------------------
 
-/** Specify array size if it hasn't been given.. */
+/** Specify array size if it hasn't been given */
 
 void Tokenizer::arraySize()
 {
@@ -1335,7 +1335,7 @@ void Tokenizer::labels()
 
 
 /**
- * is the token pointing at a template parameters block..
+ * is the token pointing at a template parameters block
  * < int , 3 > => yes
  * \param tok start token that must point at "<"
  * \return true if the tokens look like template parameters
diff --git a/lib/tokenize.h b/lib/tokenize.h
index eafd5370f..6f29d90f8 100644
--- a/lib/tokenize.h
+++ b/lib/tokenize.h
@@ -38,7 +38,7 @@ class Settings;
 class Tokenizer
 {
 private:
-    /** Deallocate lists.. */
+    /** Deallocate lists */
     void deallocateTokens();
 
 public:
@@ -179,40 +179,40 @@ public:
     bool simplifyQuestionMark();
 
     /**
-     * simplify if-assignments..
+     * simplify if-assignments
      * Example: "if(a=b);" => "a=b;if(a);"
      */
     void simplifyIfAssign();
 
     /**
-     * simplify if-not..
+     * simplify if-not
      * Example: "if(0==x);" => "if(!x);"
      */
     void simplifyIfNot();
 
     /**
-     * simplify if-not NULL..
-     * Example: "if(0!=x);" => "if(x);"
+     * simplify if-not NULL
+     * - "if(0!=x);" => "if(x);"
      */
     void simplifyIfNotNull();
 
-    /** @brief simplify if (a) { if (a) .. */
+    /** @brief simplify if (a) { if (a) */
     void simplifyIfSameInnerCondition();
 
     /**
      * Simplify the "not" and "and" keywords to "!" and "&&"
      * accordingly.
      * Examples:
-     *     "if (not p)" => "if (!p)"
-     *     "if (p and q)" => "if (p && q)"
+     * - "if (not p)" => "if (!p)"
+     * - "if (p and q)" => "if (p && q)"
      */
     void simplifyLogicalOperators();
 
     /**
-     * Simplify comma into a semicolon when possible
-     * Example: "delete a, delete b" => "delete a; delete b;"
-     * Example: "a = 0, b = 0;" => "a = 0; b = 0;"
-     * Example: "return a(), b;" => "a(); return b;"
+     * Simplify comma into a semicolon when possible:
+     * - "delete a, delete b" => "delete a; delete b;"
+     * - "a = 0, b = 0;" => "a = 0; b = 0;"
+     * - "return a(), b;" => "a(); return b;"
      */
     void simplifyComma();