diff --git a/Core/Algorithms/inc/FTDistributions.h b/Core/Algorithms/inc/FTDistributions.h
index e0cc8e6935ec4bc193c14fbd8249e52c6454e565..e36828b97969d3f26fe099bdab9a06f637cada03 100644
--- a/Core/Algorithms/inc/FTDistributions.h
+++ b/Core/Algorithms/inc/FTDistributions.h
@@ -3,7 +3,8 @@
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
 //! @file      Algorithms/inc/FTDistributions.h
-//! @brief     Defines classes IFTDistribution1D, ..2D, ..2DCauchy
+//! @brief     Defines classes IFTDistribution1D, IFTDistribution2D,
+//!              FTDistribution2DCauchy
 //!
 //! @homepage  apps.jcns.fz-juelich.de/BornAgain
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/Core/Algorithms/inc/IIntensityFunction.h b/Core/Algorithms/inc/IIntensityFunction.h
index a37680fd5d58ac400cced1b4cc6455d23bfd8aaf..a3b06c8f3936b95ee1ee01b58e5f390366c5cc90 100644
--- a/Core/Algorithms/inc/IIntensityFunction.h
+++ b/Core/Algorithms/inc/IIntensityFunction.h
@@ -3,7 +3,8 @@
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
 //! @file      Algorithms/inc/IIntensityFunction.h
-//! @brief     Defines classes IIntensityFunction, ..Log, ..Sqrt.
+//! @brief     Defines classes IIntensityFunction, IntensityFunctionLog,
+//!              IntensityFunctionSqrt
 //!
 //! @homepage  apps.jcns.fz-juelich.de/BornAgain
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/Core/Algorithms/inc/InterferenceFunctionStrategies.h b/Core/Algorithms/inc/InterferenceFunctionStrategies.h
index 9731892671abcd321a9e21963375941dc4a8cd9b..1b8e8a9f5f1bdcc43010508729f7e1d28f34a420 100644
--- a/Core/Algorithms/inc/InterferenceFunctionStrategies.h
+++ b/Core/Algorithms/inc/InterferenceFunctionStrategies.h
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
 //! @file      Algorithms/inc/InterferenceFunctionStrategies.h
-//! @brief     Includes several files names *Strategy.h.
+//! @brief     Includes several files named *Strategy.h
 //!
 //! @homepage  apps.jcns.fz-juelich.de/BornAgain
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/Core/Algorithms/inc/MaskCoordinateFunction.h b/Core/Algorithms/inc/MaskCoordinateFunction.h
index 9d457a8c3cf759cf23ac177296d0aa2abb172dcb..44e0420d253654e0fbfbca0f6ffa7400fa991f81 100644
--- a/Core/Algorithms/inc/MaskCoordinateFunction.h
+++ b/Core/Algorithms/inc/MaskCoordinateFunction.h
@@ -3,7 +3,8 @@
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
 //! @file      Algorithms/inc/MaskCoordinateFunction.h
-//! @brief     Defines classes MaskCoordinateFunction, MaskCoordinate..Function.
+//! @brief     Defines classes MaskCoordinateFunction, 
+//!              MaskCoordinateRectangleFunction, MaskCoordinateEllipseFunction 
 //!
 //! @homepage  apps.jcns.fz-juelich.de/BornAgain
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/Core/Fitting/inc/FitSuiteFunctions.h b/Core/Fitting/inc/FitSuiteFunctions.h
index 2daf7f589a1bf713368c5bf74833b3c8c205e0f2..9417e2c409640f8d2409b953799361e225f8c5e0 100644
--- a/Core/Fitting/inc/FitSuiteFunctions.h
+++ b/Core/Fitting/inc/FitSuiteFunctions.h
@@ -3,7 +3,8 @@
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
 //! @file      Fitting/inc/FitSuiteFunctions.h
-//! @brief     Defines classes IFitSuiteFunction, FitSuiteChiSquaredFunction, FitSuiteGradientFunction.
+//! @brief     Defines classes IFitSuiteFunction,
+//!              FitSuiteChiSquaredFunction, FitSuiteGradientFunction
 //!
 //! @homepage  apps.jcns.fz-juelich.de/BornAgain
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/Core/Fitting/inc/IFitSuiteStrategy.h b/Core/Fitting/inc/IFitSuiteStrategy.h
index 4bf62db632bf7d9cd85082b18ad5e11877b18a40..ca1575829a706b9694af1b6d7b20973a5d14235a 100644
--- a/Core/Fitting/inc/IFitSuiteStrategy.h
+++ b/Core/Fitting/inc/IFitSuiteStrategy.h
@@ -3,7 +3,9 @@
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
 //! @file      Fitting/inc/IFitSuiteStrategy.h
-//! @brief     Defines classes IFitSuiteStrategy, FitSuiteStrategy...
+//! @brief     Defines classes IFitSuiteStrategy, FitSuiteStrategyDefault,
+//!              FitSuiteStrategyAdjustData, FitSuiteStrategyAdjustParameters,
+//!              FitSuiteStrategyBootstrap
 //!
 //! @homepage  apps.jcns.fz-juelich.de/BornAgain
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/Core/FormFactors/src/FormFactorDecoratorTransformation.cpp b/Core/FormFactors/src/FormFactorDecoratorTransformation.cpp
index 84c4c4f313585ba6226fcea525a9a608254227ef..efdfece1c50a673eefc1a66f33e19df5f0c1d5d6 100644
--- a/Core/FormFactors/src/FormFactorDecoratorTransformation.cpp
+++ b/Core/FormFactors/src/FormFactorDecoratorTransformation.cpp
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
 //! @file      FormFactors/src/FormFactorDecoratorTransformation.cpp
-//! @brief     Just an include.
+//! @brief     Just include FormFactorDecoratorTransformation.h
 //!
 //! @homepage  apps.jcns.fz-juelich.de/BornAgain
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/Core/PythonAPI/src/PythonOutputData.cpp b/Core/PythonAPI/src/PythonOutputData.cpp
index 138db137b15c70367384a5dfa22812020a1aad49..5204fdf50a57450cb6acd82563e53ed83203d1c2 100644
--- a/Core/PythonAPI/src/PythonOutputData.cpp
+++ b/Core/PythonAPI/src/PythonOutputData.cpp
@@ -3,7 +3,8 @@
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
 //! @file      PythonAPI/src/PythonOutputData.cpp
-//! @brief     Implements a few global functions: GetOutputDataNdimensions, ..
+//! @brief     Implements a few global functions: GetOutputDataNdimensions,
+//!              GetOutputData, GetOutputDataAxis
 //!
 //! @homepage  apps.jcns.fz-juelich.de/BornAgain
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/Core/Tools/src/IFactory.cpp b/Core/Tools/src/IFactory.cpp
index 1026cbf1aad06b00820b990822993fd482dbfcc1..939072471677204405945678fb4bfb2d6cdefe07 100644
--- a/Core/Tools/src/IFactory.cpp
+++ b/Core/Tools/src/IFactory.cpp
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
 //! @file      Tools/src/IFactory.cpp
-//! @brief     Implements class IFactory by just including IFactory.h.
+//! @brief     Just include IFactory.h
 //!
 //! @homepage  apps.jcns.fz-juelich.de/BornAgain
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/Core/Tools/src/ISingleton.cpp b/Core/Tools/src/ISingleton.cpp
index 542f41b030f998c78acb21b0a189cb33b1f7f444..b1a44e06f0faf14afe4fc1c3d7bd8843b0e9096b 100644
--- a/Core/Tools/src/ISingleton.cpp
+++ b/Core/Tools/src/ISingleton.cpp
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
 //! @file      Tools/src/ISingleton.cpp
-//! @brief     Implements class ISingleton by just including ISingleton.h.
+//! @brief     Just include ISingleton.h
 //!
 //! @homepage  apps.jcns.fz-juelich.de/BornAgain
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/Core/Tools/src/OutputData.cpp b/Core/Tools/src/OutputData.cpp
index 3143c8cd4619df63b1512118d94fbb75e1542063..337df8a050c5c886aa86b7f465e6cbac0b750361 100644
--- a/Core/Tools/src/OutputData.cpp
+++ b/Core/Tools/src/OutputData.cpp
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
 //! @file      Tools/src/OutputData.cpp
-//! @brief     Implements class OutputData by just including OutputData.h.
+//! @brief     Just include OutputData.h.
 //!
 //! @homepage  apps.jcns.fz-juelich.de/BornAgain
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/Core/Tools/src/Types.cpp b/Core/Tools/src/Types.cpp
index fc79faeaa6f691e4f611126ef800c16c2bc8318b..7e75b2193cdf5c28f4d3ac8cad8368ac7a760ac2 100644
--- a/Core/Tools/src/Types.cpp
+++ b/Core/Tools/src/Types.cpp
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
 //! @file      Tools/src/Types.cpp
-//! @brief     Implements class Types by just including Types.h.
+//! @brief     Just include Types.h
 //!
 //! @homepage  apps.jcns.fz-juelich.de/BornAgain
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/pub/core/Doxyfile b/pub/core/Doxyfile
index b0c866501b748b1420caaabc5f5ecec6df6fd2fb..b96ae23881be77c0624021c43b4eb0bfde0b001d 100644
--- a/pub/core/Doxyfile
+++ b/pub/core/Doxyfile
@@ -674,7 +674,7 @@ EXCLUDE_SYMLINKS       = NO
 # against the file with absolute path, so to exclude all test directories
 # for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = # */PythonAPI/*
+EXCLUDE_PATTERNS       = *.pypp.cpp *.pypp.cpp
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the