diff --git a/dumux/discretization/basegridgeometry.hh b/dumux/discretization/basegridgeometry.hh
index 3e5ac51d5e2dc6209e5586f7525087bf4b7e51f8..5d8c58ff2c89e909a8c6fe306be7682a9a82f3f7 100644
--- a/dumux/discretization/basegridgeometry.hh
+++ b/dumux/discretization/basegridgeometry.hh
@@ -33,7 +33,7 @@
 #include <dumux/common/geometry/boundingboxtree.hh>
 #include <dumux/common/geometry/geometricentityset.hh>
 
-//! make the local view function available whenever we use the grid geometry
+// make the local view function available whenever we use the grid geometry
 #include <dumux/discretization/localview.hh>
 
 namespace Dumux {
diff --git a/dumux/discretization/box/gridfluxvariablescache.hh b/dumux/discretization/box/gridfluxvariablescache.hh
index 90d6079e80d3872e85af027c327196c87801b6c0..7f884e145bd90972dd4c1956e43365c163ec74f5 100644
--- a/dumux/discretization/box/gridfluxvariablescache.hh
+++ b/dumux/discretization/box/gridfluxvariablescache.hh
@@ -24,7 +24,7 @@
 #ifndef DUMUX_DISCRETIZATION_BOX_GRID_FLUXVARSCACHE_HH
 #define DUMUX_DISCRETIZATION_BOX_GRID_FLUXVARSCACHE_HH
 
-//! make the local view function available whenever we use this class
+// make the local view function available whenever we use this class
 #include <dumux/discretization/localview.hh>
 #include <dumux/discretization/box/elementfluxvariablescache.hh>
 
diff --git a/dumux/discretization/box/gridvolumevariables.hh b/dumux/discretization/box/gridvolumevariables.hh
index 9a54ece6e444b0860ea0e8c34f15d52f82d45225..7fb514100bdfb48f8c0e3732b02e2001f25350fb 100644
--- a/dumux/discretization/box/gridvolumevariables.hh
+++ b/dumux/discretization/box/gridvolumevariables.hh
@@ -26,7 +26,7 @@
 
 #include <type_traits>
 
-//! make the local view function available whenever we use this class
+// make the local view function available whenever we use this class
 #include <dumux/discretization/localview.hh>
 #include <dumux/discretization/box/elementvolumevariables.hh>
 #include <dumux/discretization/box/elementsolution.hh>
diff --git a/dumux/discretization/cellcentered/gridvolumevariables.hh b/dumux/discretization/cellcentered/gridvolumevariables.hh
index 62897f109bf41e51ff3fb1d099ad3d47e6ea3906..fddd114a4ebeb0520aa8bdf197c74ce90d297c13 100644
--- a/dumux/discretization/cellcentered/gridvolumevariables.hh
+++ b/dumux/discretization/cellcentered/gridvolumevariables.hh
@@ -27,7 +27,7 @@
 #include <vector>
 #include <type_traits>
 
-//! make the local view function available whenever we use this class
+// make the local view function available whenever we use this class
 #include <dumux/discretization/localview.hh>
 #include <dumux/discretization/cellcentered/elementsolution.hh>
 
diff --git a/dumux/discretization/cellcentered/mpfa/gridfluxvariablescache.hh b/dumux/discretization/cellcentered/mpfa/gridfluxvariablescache.hh
index 0b1a77744d09b6834dc448e8c312801022f691a3..3bfc795c63249e8d39c8fef2f0723c251d8772bd 100644
--- a/dumux/discretization/cellcentered/mpfa/gridfluxvariablescache.hh
+++ b/dumux/discretization/cellcentered/mpfa/gridfluxvariablescache.hh
@@ -24,7 +24,7 @@
 #ifndef DUMUX_DISCRETIZATION_CCMPFA_GRID_FLUXVARSCACHE_HH
 #define DUMUX_DISCRETIZATION_CCMPFA_GRID_FLUXVARSCACHE_HH
 
-//! make the local view function available whenever we use this class
+// make the local view function available whenever we use this class
 #include <dumux/discretization/localview.hh>
 #include <dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh>
 
diff --git a/dumux/discretization/cellcentered/tpfa/gridfluxvariablescache.hh b/dumux/discretization/cellcentered/tpfa/gridfluxvariablescache.hh
index f368da20db8e14d537a5cb731c8addeb2e4b9a81..f40853ed125c580054ef6610a1e71519e6105c50 100644
--- a/dumux/discretization/cellcentered/tpfa/gridfluxvariablescache.hh
+++ b/dumux/discretization/cellcentered/tpfa/gridfluxvariablescache.hh
@@ -24,7 +24,7 @@
 #ifndef DUMUX_DISCRETIZATION_CCTPFA_GRID_FLUXVARSCACHE_HH
 #define DUMUX_DISCRETIZATION_CCTPFA_GRID_FLUXVARSCACHE_HH
 
-//! make the local view function available whenever we use this class
+// make the local view function available whenever we use this class
 #include <dumux/discretization/localview.hh>
 #include <dumux/discretization/cellcentered/tpfa/elementfluxvariablescache.hh>
 
diff --git a/dumux/discretization/staggered/freeflow/gridvolumevariables.hh b/dumux/discretization/staggered/freeflow/gridvolumevariables.hh
index badedcf28729620dffd1ae17fe2df2e7ff883aa7..85534fa69c674a85b532a55def31d30756a0031b 100644
--- a/dumux/discretization/staggered/freeflow/gridvolumevariables.hh
+++ b/dumux/discretization/staggered/freeflow/gridvolumevariables.hh
@@ -27,7 +27,7 @@
 #include <dune/common/exceptions.hh>
 #include <dune/common/rangeutilities.hh>
 
-//! make the local view function available whenever we use this class
+// make the local view function available whenever we use this class
 #include <dumux/discretization/localview.hh>
 #include <dumux/discretization/staggered/elementsolution.hh>
 #include <dumux/discretization/staggered/freeflow/elementvolumevariables.hh>
diff --git a/dumux/discretization/staggered/gridfacevariables.hh b/dumux/discretization/staggered/gridfacevariables.hh
index ccc8859b48176b79a1e84de90a0547fec5257763..f968199a1ca9464790314ad0f5280308f252e712 100644
--- a/dumux/discretization/staggered/gridfacevariables.hh
+++ b/dumux/discretization/staggered/gridfacevariables.hh
@@ -24,7 +24,7 @@
 #ifndef DUMUX_DISCRETIZATION_STAGGERED_GRID_FACEVARIABLES_HH
 #define DUMUX_DISCRETIZATION_STAGGERED_GRID_FACEVARIABLES_HH
 
-//! make the local view function available whenever we use this class
+// make the local view function available whenever we use this class
 #include <dumux/discretization/localview.hh>
 #include <dumux/discretization/staggered/elementfacevariables.hh>
 #include <dumux/discretization/staggered/facesolution.hh>
diff --git a/dumux/discretization/staggered/gridfluxvariablescache.hh b/dumux/discretization/staggered/gridfluxvariablescache.hh
index b78cbe750302a58f66f18bc8dc4d04d6afeff516..ccef6e2e20871613b82296fef0e2882a1e3cf00b 100644
--- a/dumux/discretization/staggered/gridfluxvariablescache.hh
+++ b/dumux/discretization/staggered/gridfluxvariablescache.hh
@@ -24,7 +24,7 @@
 #ifndef DUMUX_DISCRETIZATION_STAGGERED_GRID_FLUXVARSCACHE_HH
 #define DUMUX_DISCRETIZATION_STAGGERED_GRID_FLUXVARSCACHE_HH
 
-//! make the local view function available whenever we use this class
+// make the local view function available whenever we use this class
 #include <dumux/discretization/localview.hh>
 #include <dumux/discretization/staggered/elementfluxvariablescache.hh>
 
diff --git a/dumux/porousmediumflow/mpnc/model.hh b/dumux/porousmediumflow/mpnc/model.hh
index 4d2ed7d63e13f99eca3718ac87189dee5c6f5696..0f3e397778bb4ff7af057e7215b97e054d0a2650 100644
--- a/dumux/porousmediumflow/mpnc/model.hh
+++ b/dumux/porousmediumflow/mpnc/model.hh
@@ -119,10 +119,6 @@
 #include "localresidual.hh"
 #include "pressureformulation.hh"
 
-/*!
- * \ingroup MPNCModel
- * \brief Defines the properties required for the MpNc fully implicit model.
- */
 namespace Dumux
 {
 
diff --git a/test/porousmediumflow/2p/implicit/adaptive/main.cc b/test/porousmediumflow/2p/implicit/adaptive/main.cc
index 2e9778f5076b595425cd5b10166aab73959c622f..44512751dd6b98b8951df54778a2556f3e4ddb6a 100644
--- a/test/porousmediumflow/2p/implicit/adaptive/main.cc
+++ b/test/porousmediumflow/2p/implicit/adaptive/main.cc
@@ -56,12 +56,12 @@
 #include <dumux/porousmediumflow/2p/griddatatransfer.hh>
 #include <dumux/porousmediumflow/2p/gridadaptindicator.hh>
 
-//! Use the incompressible or point source problem for this adaptive test
+// Use the incompressible or point source problem for this adaptive test
 #include <test/porousmediumflow/2p/implicit/incompressible/problem.hh>
 #include "pointsourceproblem.hh"
 #include "problem.hh"
 
-//! Type tags for the adaptive versions of the two-phase incompressible problem
+// Type tags for the adaptive versions of the two-phase incompressible problem
 namespace Dumux {
 namespace Properties {
 //! Type Tags for the adaptive tests
diff --git a/test/porousmediumflow/2p/implicit/boxdfm/spatialparams.hh b/test/porousmediumflow/2p/implicit/boxdfm/spatialparams.hh
index 21e983c73eff2099e69bdaf6dabfcde6513045b7..5d0455254f81a265a3ccd89f82785c3bb62285d0 100644
--- a/test/porousmediumflow/2p/implicit/boxdfm/spatialparams.hh
+++ b/test/porousmediumflow/2p/implicit/boxdfm/spatialparams.hh
@@ -17,6 +17,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  *****************************************************************************/
 /*!
+ * \file
  * \ingroup TwoPTests
  * \brief The spatial params for the incompressible 2p test.
  */
diff --git a/test/porousmediumflow/2p/implicit/cornerpoint/spatialparams.hh b/test/porousmediumflow/2p/implicit/cornerpoint/spatialparams.hh
index e01602f20605655964480082f2feb4b8a9d835f1..22d56066eae216c2d03bbcec595c5da6ba461979 100644
--- a/test/porousmediumflow/2p/implicit/cornerpoint/spatialparams.hh
+++ b/test/porousmediumflow/2p/implicit/cornerpoint/spatialparams.hh
@@ -17,6 +17,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  *****************************************************************************/
 /*!
+ * \file
  * \ingroup TwoPTests
  * \brief The spatial params for the 2p cornerpoint test.
  */
diff --git a/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh b/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh
index d0912b6feefaf7f947921f4d4fc0888acdbfefde..1232ca5d2b4c72808481de848cc3484d0df8ac0f 100644
--- a/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh
+++ b/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh
@@ -17,6 +17,7 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  *****************************************************************************/
 /*!
+ * \file
  * \ingroup TwoPTests
  * \brief The spatial params for the incompressible 2p test.
  */
diff --git a/test/porousmediumflow/3p/implicit/convection/problem.hh b/test/porousmediumflow/3p/implicit/convection/problem.hh
index 4ec0fbc1cd59fb417687548f171da2de3de55406..d712c39d1dcfba8ec83496f93dd65fa48a8f134e 100644
--- a/test/porousmediumflow/3p/implicit/convection/problem.hh
+++ b/test/porousmediumflow/3p/implicit/convection/problem.hh
@@ -38,7 +38,7 @@
 #include <dumux/material/components/h2o.hh>
 #include <dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh>
 
-#include "../conduction/spatialparams.hh"  //! reuse the conduction spatialParams
+#include "../conduction/spatialparams.hh"  // reuse the conduction spatialParams
 
 namespace Dumux {
 /**