diff --git a/Core/FormFactors/FormFactorDecoratorRotation.cpp b/Core/FormFactors/FormFactorDecoratorRotation.cpp
index a613731ce4049f459589e9bd2cc2f7933286b670..1c3631bbda0bd325dc02c6ee09ad72dcc1ef3eda 100644
--- a/Core/FormFactors/FormFactorDecoratorRotation.cpp
+++ b/Core/FormFactors/FormFactorDecoratorRotation.cpp
@@ -15,7 +15,6 @@
 
 #include "FormFactorDecoratorRotation.h"
 #include "BornAgainNamespace.h"
-
 #include <memory>
 
 FormFactorDecoratorRotation::FormFactorDecoratorRotation(
diff --git a/Core/FormFactors/FormFactorFullSpheroid.h b/Core/FormFactors/FormFactorFullSpheroid.h
index 8661e0faeba4c6c1110e6fd3879550bf47bbc446..473a9a001c4a88a5df79e44b437ff3dab48d9043 100644
--- a/Core/FormFactors/FormFactorFullSpheroid.h
+++ b/Core/FormFactors/FormFactorFullSpheroid.h
@@ -17,7 +17,6 @@
 #define FORMFACTORFULLSPHEROID_H
 
 #include "IFormFactorBorn.h"
-
 #include <memory>
 
 // Forward declaration to prevent IntegratorComplex.h to be parsed for Python API:
diff --git a/Core/FormFactors/FormFactorHemiEllipsoid.h b/Core/FormFactors/FormFactorHemiEllipsoid.h
index 9d18e4de194794f252013ca2388b3316c4c8f2fb..257629c9a7219a06f3eaf778dedcf91eb35a0595 100644
--- a/Core/FormFactors/FormFactorHemiEllipsoid.h
+++ b/Core/FormFactors/FormFactorHemiEllipsoid.h
@@ -17,7 +17,6 @@
 #define FORMFACTORHEMIELLIPSOID_H
 
 #include "IFormFactorBorn.h"
-
 #include <memory>
 
 // Forward declaration to prevent IntegratorComplex.h to be parsed for Python API:
diff --git a/Core/FormFactors/FormFactorLongRipple1Gauss.h b/Core/FormFactors/FormFactorLongRipple1Gauss.h
index 3486a0efb285771302a2e761f526605a8c6cd8c3..5d395f188ce70c5acd4683fe607875f6a223c446 100644
--- a/Core/FormFactors/FormFactorLongRipple1Gauss.h
+++ b/Core/FormFactors/FormFactorLongRipple1Gauss.h
@@ -17,7 +17,6 @@
 #define FORMFACTORLONGRIPPLE1GAUSS_H
 
 #include "IFormFactorBorn.h"
-
 #include <memory>
 
 // Forward declaration to prevent IntegratorComplex.h to be parsed for Python API:
diff --git a/Core/FormFactors/FormFactorLongRipple1Lorentz.h b/Core/FormFactors/FormFactorLongRipple1Lorentz.h
index 7f3da370a85a9d1985ee96cb1b928e23e3a4d9b0..2dd3fee0f3479e178ac7fd6bcb605989134bd11a 100644
--- a/Core/FormFactors/FormFactorLongRipple1Lorentz.h
+++ b/Core/FormFactors/FormFactorLongRipple1Lorentz.h
@@ -17,7 +17,6 @@
 #define FORMFACTORLONGRIPPLE1LORENTZ_H
 
 #include "IFormFactorBorn.h"
-
 #include <memory>
 
 // Forward declaration to prevent IntegratorComplex.h to be parsed for Python API:
diff --git a/Core/FormFactors/FormFactorPolyhedron.cpp b/Core/FormFactors/FormFactorPolyhedron.cpp
index 29450a9c8154f7ff123521fd245c52f34c3001f1..60159f15bed714cba46571eb5076a8fe9823ebbe 100644
--- a/Core/FormFactors/FormFactorPolyhedron.cpp
+++ b/Core/FormFactors/FormFactorPolyhedron.cpp
@@ -18,11 +18,9 @@
 //! "Form factor (Fourier shape transform) of polygon and polyhedron."
 
 #include <iomanip>
-
 #include "Precomputed.h"
 #include "MathFunctions.h"
 #include "BornAgainNamespace.h"
-
 #include "FormFactorPolyhedron.h"
 
 static const complex_t I(0.,1.);
diff --git a/Core/FormFactors/FormFactorRipple1.h b/Core/FormFactors/FormFactorRipple1.h
index a216e7cd1734bf5c80a374a059f99726956beae3..0fa5a08261998367c6d44bfe36c96864a250478d 100644
--- a/Core/FormFactors/FormFactorRipple1.h
+++ b/Core/FormFactors/FormFactorRipple1.h
@@ -17,7 +17,6 @@
 #define FORMFACTORRIPPLE1_H
 
 #include "IFormFactorBorn.h"
-
 #include <memory>
 
 // Forward declaration to prevent IntegratorComplex.h to be parsed for Python API:
diff --git a/Core/FormFactors/FormFactorSphereLogNormalRadius.h b/Core/FormFactors/FormFactorSphereLogNormalRadius.h
index c28ffad3c6d337133bb7ee714df4908c060152f3..10271a5418c924184fa5428309dcdc184d701aa6 100644
--- a/Core/FormFactors/FormFactorSphereLogNormalRadius.h
+++ b/Core/FormFactors/FormFactorSphereLogNormalRadius.h
@@ -16,7 +16,6 @@
 #ifndef FORMFACTORSPHERELOGNORMALRADIUS_H
 #define FORMFACTORSPHERELOGNORMALRADIUS_H
 #include "SafePointerVector.h"
-
 #include "FormFactorFullSphere.h"
 
 class DistributionLogNormal;
diff --git a/Core/FormFactors/FormFactorTruncatedSphere.h b/Core/FormFactors/FormFactorTruncatedSphere.h
index 9c163c2288531fc4e67f0922a01de8233f6f64ed..1ad8ba95383d5c178b4d47abe730e54f407ba9c9 100644
--- a/Core/FormFactors/FormFactorTruncatedSphere.h
+++ b/Core/FormFactors/FormFactorTruncatedSphere.h
@@ -17,7 +17,6 @@
 #define FORMFACTORTRUNCATEDSPHERE_H
 
 #include "IFormFactorBorn.h"
-
 #include <memory>
 
 // Forward declaration to prevent IntegratorComplex.h to be parsed for Python API:
diff --git a/Core/FormFactors/FormFactorTruncatedSpheroid.h b/Core/FormFactors/FormFactorTruncatedSpheroid.h
index 80cf63ba3b9e5cb4a66929352cdac1aab149431d..7ba14a41011ebb926a9f6d0e94aaa8fe4672ebb8 100644
--- a/Core/FormFactors/FormFactorTruncatedSpheroid.h
+++ b/Core/FormFactors/FormFactorTruncatedSpheroid.h
@@ -17,7 +17,6 @@
 #define FORMFACTORTRUNCATEDSPHEROID_H
 
 #include "IFormFactorBorn.h"
-
 #include <memory>
 
 // Forward declaration to prevent IntegratorComplex.h to be parsed for Python API:
diff --git a/Core/Tools/Bin.h b/Core/Tools/Bin.h
index 99657c48451301ed05cd1180914e9a5b21a0a635..2b95ac293c669576a73a7f6f050dca50c3f8d03c 100644
--- a/Core/Tools/Bin.h
+++ b/Core/Tools/Bin.h
@@ -18,11 +18,6 @@
 
 #include "Numeric.h"
 #include "Vectors3D.h"
-
-//! @class Bin1D
-//! @ingroup tools_internal
-//! @brief One dimensional bin with left and right bounds.
-
 #include <iostream>
 
 struct BA_CORE_API_ Bin1D
diff --git a/Core/Tools/IParameterized.cpp b/Core/Tools/IParameterized.cpp
index dd38bb4c914ec753b787b74489ae4db6c613a1e2..2cf561dbc9ac13f50cba7b2412ecc85d37a124a6 100644
--- a/Core/Tools/IParameterized.cpp
+++ b/Core/Tools/IParameterized.cpp
@@ -14,7 +14,6 @@
 // ************************************************************************** //
 
 #include "IParameterized.h"
-
 #include <sstream>
 #include <memory>
 
diff --git a/Core/Tools/MathFunctions.cpp b/Core/Tools/MathFunctions.cpp
index 3b5f7c1621152cef53c28d604df05ded82e2508b..7ad94e6e5bc2f4dd5a38887391742ede18a56adf 100644
--- a/Core/Tools/MathFunctions.cpp
+++ b/Core/Tools/MathFunctions.cpp
@@ -14,7 +14,6 @@
 // ************************************************************************** //
 
 #include "MathFunctions.h"
-
 #include <cstring>
 #include <fftw3.h>
 #include <gsl/gsl_sf_erf.h>
diff --git a/Core/Tools/MathFunctions.h b/Core/Tools/MathFunctions.h
index 4029374176c949b04a232cbcf6a51030321da546..03e216448e6757569637afef2a958cbf8953614c 100644
--- a/Core/Tools/MathFunctions.h
+++ b/Core/Tools/MathFunctions.h
@@ -19,7 +19,6 @@
 #include "Complex.h"
 #include "Units.h"
 #include "Numeric.h"
-
 #include <vector>
 
 //! Various mathematical functions.
diff --git a/Core/Tools/MessageService.cpp b/Core/Tools/MessageService.cpp
index f1665b857d9b1d6bef3c4365a7bfb48c3a72877b..1b3f8673aba2be828b532b8f9c63946ee242e69e 100644
--- a/Core/Tools/MessageService.cpp
+++ b/Core/Tools/MessageService.cpp
@@ -15,7 +15,6 @@
 
 #include "MessageService.h"
 #include "Exceptions.h"
-//#include <sys/time.h>
 #include <boost/date_time/posix_time/posix_time.hpp>
 
 std::vector<std::string> MSG::Logger::m_level_names =
diff --git a/Core/Tools/NumpyUtils.h b/Core/Tools/NumpyUtils.h
index 6b77b27a24de44ecea0eb75395eda6626d7e9fae..fea002dc8249ca28d988c2b550d8d49ceba4d2ab 100644
--- a/Core/Tools/NumpyUtils.h
+++ b/Core/Tools/NumpyUtils.h
@@ -20,7 +20,6 @@
 
 #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
 #include "Python.h"
-
 #include <vector>
 
 namespace Utils
diff --git a/Core/Tools/OutputDataFunctions.cpp b/Core/Tools/OutputDataFunctions.cpp
index e9a54b9a76e2eed2354107414ef3d9c9514a08ca..a2f2022b334a742da95090dc7fc4891231312a9e 100644
--- a/Core/Tools/OutputDataFunctions.cpp
+++ b/Core/Tools/OutputDataFunctions.cpp
@@ -14,7 +14,6 @@
 // ************************************************************************** //
 
 #include "OutputDataFunctions.h"
-
 #include <fftw3.h>
 
 void toFftw3Array(complex_t *source, size_t length, fftw_complex *destination);
diff --git a/Core/Tools/ParameterDistribution.cpp b/Core/Tools/ParameterDistribution.cpp
index dfbf7b160630540e4a95b5dd51c7dff625b82964..ef87a3892c5009b21ad137416d25837b2b50a048 100644
--- a/Core/Tools/ParameterDistribution.cpp
+++ b/Core/Tools/ParameterDistribution.cpp
@@ -14,7 +14,6 @@
 // ************************************************************************** //
 
 #include "ParameterDistribution.h"
-
 #include "Distributions.h"
 
 
diff --git a/Core/Tools/ParameterDistribution.h b/Core/Tools/ParameterDistribution.h
index 394fd71c72f825ac63f4e12c8f59082cf3321c4e..22d17d2032dfca0972cdcd2868a8a45ab261f61f 100644
--- a/Core/Tools/ParameterDistribution.h
+++ b/Core/Tools/ParameterDistribution.h
@@ -18,7 +18,6 @@
 
 #include "ParameterSample.h"
 #include "IParameterized.h"
-
 #include <memory>
 
 class IDistribution1D;
diff --git a/Core/Tools/Utils.cpp b/Core/Tools/Utils.cpp
index 0725f12de215ed3f28c729c87366c26a5d887c09..fa14f66979501f9b8edae41d59ab6e2f7d257856 100644
--- a/Core/Tools/Utils.cpp
+++ b/Core/Tools/Utils.cpp
@@ -14,7 +14,6 @@
 // ************************************************************************** //
 
 #include "Utils.h"
-
 #include <boost/regex.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>