diff --git a/lib/mathlib.cpp b/lib/mathlib.cpp
index 9735d0e94..89b9ab0f3 100644
--- a/lib/mathlib.cpp
+++ b/lib/mathlib.cpp
@@ -375,7 +375,6 @@ bool MathLib::isValidSuffix(std::string::const_iterator it, std::string::const_i
             break;
         case SUFFIX_LU:
             return false;
-            break;
         case SUFFIX_LL:
             if (*it == 'u' || *it == 'U')
                 state = SUFFIX_LLU; // LLU
diff --git a/lib/preprocessor.h b/lib/preprocessor.h
index cd5e021ae..1e161545f 100644
--- a/lib/preprocessor.h
+++ b/lib/preprocessor.h
@@ -258,14 +258,13 @@ private:
     /**
      * Search includes from code and append code from the included
      * file
-     * @param code The source code to modify
+     * @param[in,out] code The source code to modify
      * @param filePath Relative path to file to check e.g. "src/main.cpp"
      * @param includePaths List of paths where include files should be searched from,
      * single path can be e.g. in format "include/".
      * There must be a path separator at the end. Default parameter is empty list.
      * Note that if path from given filename is also extracted and that is used as
      * a last include path if include file was not found from earlier paths.
-     * @return modified source code
      */
     void handleIncludes(std::string &code, const std::string &filePath, const std::list<std::string> &includePaths);
 
diff --git a/lib/token.h b/lib/token.h
index 2eb2b5f22..2825502ac 100644
--- a/lib/token.h
+++ b/lib/token.h
@@ -447,7 +447,7 @@ public:
      * @param varid Print varids. (Style: "varname@id")
      * @param attributes Print attributes of tokens like "unsigned" in front of it.
      * @param linenumbers Print line number in front of each line
-     * @param linebreaks Insert \n into string when line number changes
+     * @param linebreaks Insert "\n" into string when line number changes
      * @param files print Files as numbers or as names (if fileNames is given)
      * @param fileNames Vector of filenames. Used (if given) to print filenames as strings instead of numbers.
      * @param end Stringification ends before this token is reached. 0 to stringify until end of list.
diff --git a/lib/tokenize.h b/lib/tokenize.h
index d74990c75..b15ef0b6d 100644
--- a/lib/tokenize.h
+++ b/lib/tokenize.h
@@ -187,8 +187,6 @@ public:
     void arraySize();
 
     /** Simplify labels and 'case|default' syntaxes.
-      * @return true if found nothing or the syntax is correct.
-      *         false if syntax is found to be wrong.
       */
     void simplifyLabelsCaseDefault();
 
@@ -450,7 +448,6 @@ public:
     /**
      * Simplify functions like "void f(x) int x; {"
      * into "void f(int x) {"
-     * @return false only if there's a syntax error
      */
     void simplifyFunctionParameters();
 
@@ -564,9 +561,6 @@ public:
 
     /**
      * Setup links for tokens so that one can call Token::link().
-     *
-     * @return false if there was a mismatch with tokens, this
-     * should mean that source code was not valid.
      */
     void createLinks();
 
@@ -587,7 +581,6 @@ public:
     /**
      * assert that tokens are ok - used during debugging for example
      * to catch problems in simplifyTokenList.
-     * @return always true.
      */
     void validate() const;
 
diff --git a/test/testother.cpp b/test/testother.cpp
index 2c356552b..f3262ac19 100644
--- a/test/testother.cpp
+++ b/test/testother.cpp
@@ -6637,7 +6637,7 @@ private:
 
     void checkPipeParameterSize() { // #3521
         check("void f(){\n"
-              "int pipefd[1];\n" //<--  array of two integers is needed
+              "int pipefd[1];\n" // <--  array of two integers is needed
               "if (pipe(pipefd) == -1) {\n"
               "    return;\n"
               "  }\n"
@@ -6661,7 +6661,7 @@ private:
         ASSERT_EQUALS("", errout.str());
 
         check("void f(){\n"
-              "int pipefd[1];\n" //<--  array of two integers is needed
+              "int pipefd[1];\n" // <--  array of two integers is needed
               "if (pipe2(pipefd,0) == -1) {\n"
               "    return;\n"
               "  }\n"