diff --git a/dune/stuff/functions.hh b/dune/stuff/functions.hh
index 73c01129c8ff987a9be9aa55a42430f3c4a54639..3ff12d3b3404323231bb67a7a8d99478996a9bb8 100644
--- a/dune/stuff/functions.hh
+++ b/dune/stuff/functions.hh
@@ -25,7 +25,6 @@
 namespace Dune {
 namespace Stuff {
 
-
 /**
  * \note If you want to add a new function FooBar, do the following: provide a definition that is available for all
  *       template arguments, like:
@@ -237,9 +236,7 @@ public:
   } // ... create(...)
 }; // class FunctionsProvider
 
-
 } // namespace Stuff
 } // namespace Dune
 
-
 #endif // DUNE_STUFF_FUNCTIONS_HH
diff --git a/dune/stuff/functions/ESV2007.hh b/dune/stuff/functions/ESV2007.hh
index 2c6a33c1eae6d484707262ae066160f1e6e4f297..c8210b7173e12b38786f2d300f13dd38b2d33b02 100644
--- a/dune/stuff/functions/ESV2007.hh
+++ b/dune/stuff/functions/ESV2007.hh
@@ -28,7 +28,6 @@ namespace Stuff {
 namespace Functions {
 namespace ESV2007 {
 
-
 template <class E, class D, size_t d, class R, size_t r, size_t rC = 1>
 class Testcase1Force : public LocalizableFunctionInterface<E, D, d, R, r, rC>
 {
@@ -38,7 +37,6 @@ class Testcase1Force : public LocalizableFunctionInterface<E, D, d, R, r, rC>
   }
 };
 
-
 template <class EntityImp, class DomainFieldImp, class RangeFieldImp>
 class Testcase1Force<EntityImp, DomainFieldImp, 2, RangeFieldImp, 1, 1>
     : public GlobalFunctionInterface<EntityImp, DomainFieldImp, 2, RangeFieldImp, 1>
@@ -136,7 +134,6 @@ private:
   const std::string name_;
 }; // class Testcase1Force
 
-
 template <class E, class D, size_t d, class R, size_t r, size_t rC = 1>
 class Testcase1ExactSolution : public LocalizableFunctionInterface<E, D, d, R, r, rC>
 {
@@ -146,7 +143,6 @@ class Testcase1ExactSolution : public LocalizableFunctionInterface<E, D, d, R, r
   }
 };
 
-
 template <class EntityImp, class DomainFieldImp, class RangeFieldImp>
 class Testcase1ExactSolution<EntityImp, DomainFieldImp, 2, RangeFieldImp, 1, 1>
     : public GlobalFunctionInterface<EntityImp, DomainFieldImp, 2, RangeFieldImp, 1, 1>
@@ -244,11 +240,9 @@ private:
   const std::string name_;
 }; // class Testcase1ExactSolution
 
-
 template <class DiffusionFactorType, class DiffusionTensorType = void>
 class Cutoff;
 
-
 template <class DiffusionType>
 class Cutoff<DiffusionType, void>
     : public LocalizableFunctionInterface<typename DiffusionType::EntityType, typename DiffusionType::DomainFieldType,
@@ -390,7 +384,6 @@ private:
   std::string name_;
 }; // class Cutoff
 
-
 template <class DiffusionFactorType, class DiffusionTensorType>
 class Cutoff
     : public LocalizableFunctionInterface<typename DiffusionFactorType::EntityType,
@@ -614,7 +607,6 @@ private:
   std::string name_;
 }; // class Cutoff
 
-
 } // namespace ESV2007
 } // namespace Functions
 } // namespace Stuff
diff --git a/dune/stuff/functions/affine.hh b/dune/stuff/functions/affine.hh
index cd35706360dc5e510678f47640967eae9288b439..7edd2647bccd1a4febcc4247ecc3e5fca8350b8d 100644
--- a/dune/stuff/functions/affine.hh
+++ b/dune/stuff/functions/affine.hh
@@ -32,7 +32,6 @@ class Affine
   }
 };
 
-
 template <class EntityImp, class DomainFieldImp, size_t domainDim, class RangeFieldImp, size_t rangeDim>
 class Affine<EntityImp, DomainFieldImp, domainDim, RangeFieldImp, rangeDim, 1>
     : public GlobalFunctionInterface<EntityImp, DomainFieldImp, domainDim, RangeFieldImp, rangeDim, 1>
@@ -123,7 +122,6 @@ private:
   const std::string name_;
 };
 
-
 } // namespace Functions
 } // namespace Stuff
 } // namespace Dune
diff --git a/dune/stuff/functions/checkerboard.hh b/dune/stuff/functions/checkerboard.hh
index 0c4ca821094205607dd5ceb3853cb6bb49cff28e..6d929497829c7b939acb303803e4e0ed2f1cfe1a 100644
--- a/dune/stuff/functions/checkerboard.hh
+++ b/dune/stuff/functions/checkerboard.hh
@@ -22,7 +22,6 @@ namespace Dune {
 namespace Stuff {
 namespace Functions {
 
-
 template <class EntityImp, class DomainFieldImp, size_t domainDim, class RangeFieldImp, size_t rangeDim,
           size_t rangeDimCols = 1>
 class Checkerboard
@@ -224,7 +223,6 @@ private:
   std::string name_;
 }; // class Checkerboard
 
-
 } // namespace Functions
 } // namespace Stuff
 } // namespace Dune
diff --git a/dune/stuff/functions/combined.hh b/dune/stuff/functions/combined.hh
index e6ea00da14e3fe62ed7198f33d776925b20a42de..37ccf93b59a9bb701e2a82a89b5f9f54ca5b2010 100644
--- a/dune/stuff/functions/combined.hh
+++ b/dune/stuff/functions/combined.hh
@@ -20,7 +20,6 @@ namespace Stuff {
 namespace Functions {
 namespace internal {
 
-
 enum class Combination
 {
   difference,
@@ -28,7 +27,6 @@ enum class Combination
   product
 }; // enum class Combination
 
-
 /**
  * \brief Helper class defining types of combined functions, if available.
  *
@@ -225,7 +223,6 @@ public:
   }
 }; // class SelectCombined
 
-
 /**
  * \brief Generic combined local function.
  *
@@ -282,7 +279,6 @@ private:
   mutable JacobianRangeType tmp_jacobian_;
 }; // class CombinedLocalFunction
 
-
 /**
  * \brief Generic combined function.
  *
@@ -405,10 +401,8 @@ private:
   const std::string name_;
 }; // class Combined
 
-
 } // namespace internal
 
-
 /**
  * \brief Function representing the difference between two functions.
  *
@@ -427,7 +421,6 @@ public:
   }
 }; // class Difference
 
-
 /**
  * \brief Function representing the sum of two functions.
  *
@@ -446,7 +439,6 @@ public:
   }
 }; // class Sum
 
-
 /**
  * \brief Function representing the product of two functions.
  *
@@ -465,7 +457,6 @@ public:
   }
 }; // class Product
 
-
 template <class T1, class T2, class... Args>
 std::shared_ptr<Difference<T1, T2>> make_difference(const T1& left, const T2& right, Args&&... args)
 {
@@ -478,7 +469,6 @@ std::shared_ptr<Difference<T1, T2>> make_difference(std::shared_ptr<T1> left, st
   return std::make_shared<Difference<T1, T2>>(left, right, std::forward<Args>(args)...);
 }
 
-
 template <class T1, class T2, class... Args>
 std::shared_ptr<Sum<T1, T2>> make_sum(const T1& left, const T2& right, Args&&... args)
 {
@@ -491,7 +481,6 @@ std::shared_ptr<Sum<T1, T2>> make_sum(std::shared_ptr<T1> left, std::shared_ptr<
   return std::make_shared<Sum<T1, T2>>(left, right, std::forward<Args>(args)...);
 }
 
-
 template <class T1, class T2, class... Args>
 std::shared_ptr<Product<T1, T2>> make_product(const T1& left, const T2& right, Args&&... args)
 {
@@ -504,7 +493,6 @@ std::shared_ptr<Product<T1, T2>> make_product(std::shared_ptr<T1> left, std::sha
   return std::make_shared<Product<T1, T2>>(left, right, std::forward<Args>(args)...);
 }
 
-
 } // namespace Functions
 } // namespace Stuff
 } // namespace Dune
diff --git a/dune/stuff/functions/constant.hh b/dune/stuff/functions/constant.hh
index 6939149aebf77de4f2b9ed60618188906095ab03..33642e758a746483b592e518fc5e8465a86720a8 100644
--- a/dune/stuff/functions/constant.hh
+++ b/dune/stuff/functions/constant.hh
@@ -19,7 +19,6 @@ namespace Stuff {
 namespace Functions {
 namespace internal {
 
-
 template <class K, int dim>
 struct UnitMatrix
 {
@@ -34,7 +33,6 @@ struct UnitMatrix
   }
 }; // struct UnitMatrix
 
-
 template <class K>
 struct UnitMatrix<K, 1>
 {
@@ -46,14 +44,12 @@ struct UnitMatrix<K, 1>
   }
 }; // struct UnitMatrix
 
-
 template <class K, int dim>
 typename UnitMatrix<K, dim>::type unit_matrix()
 {
   return UnitMatrix<K, dim>::value();
 }
 
-
 template <class R, size_t r, size_t rC>
 struct Get
 {
@@ -111,10 +107,8 @@ struct Get<R, 1, 1>
   }
 };
 
-
 } // namespace internal
 
-
 template <class EntityImp, class DomainFieldImp, size_t domainDim, class RangeFieldImp, size_t rangeDim,
           size_t rangeDimCols = 1>
 class Constant
@@ -217,7 +211,6 @@ private:
   const std::string name_;
 };
 
-
 } // namespace Functions
 } // namespace Stuff
 } // namespace Dune
diff --git a/dune/stuff/functions/default.hh b/dune/stuff/functions/default.hh
index 010a39a53d4e687c402a576ae3266069edc1d7a5..f70105ce3f243365dc202a5424ec04895f7f98fc 100644
--- a/dune/stuff/functions/default.hh
+++ b/dune/stuff/functions/default.hh
@@ -22,7 +22,6 @@ namespace Functions {
 
 #if HAVE_DUNE_GRID
 
-
 template <class GridViewType, size_t dimRange, size_t dimRangeCols>
 class VisualizationAdapter : public VTKFunction<GridViewType>
 {
@@ -103,7 +102,6 @@ private:
   const std::string name_;
 }; // class VisualizationAdapter
 
-
 #endif // HAVE_DUNE_GRID
 
 } // namespace Functions
diff --git a/dune/stuff/functions/derived.hh b/dune/stuff/functions/derived.hh
index d02749a194d633fac322b4c56f3719f9b8d26196..26c30418b11b87c92216c86901a87065e4d0dc2d 100644
--- a/dune/stuff/functions/derived.hh
+++ b/dune/stuff/functions/derived.hh
@@ -23,13 +23,11 @@ namespace Stuff {
 namespace Functions {
 namespace internal {
 
-
 enum class Derivative
 {
   divergence
 };
 
-
 template <class FunctionType, Derivative derivative>
 class SelectDerived
 {
@@ -132,7 +130,6 @@ public:
   }
 }; // class SelectDerived
 
-
 template <class FunctionType, Derivative derivative>
 class DerivedLocalFunction
     : public LocalfunctionInterface<
@@ -178,7 +175,6 @@ private:
   const std::unique_ptr<const typename FunctionType::LocalfunctionType> func_local_;
 }; // class DerivedLocalFunction
 
-
 template <class FunctionType, Derivative derivative>
 class Derived
     : public LocalizableFunctionInterface<
@@ -244,10 +240,8 @@ private:
   const std::string name_;
 }; // class Derived
 
-
 } // namespace internal
 
-
 template <class FunctionType>
 class Divergence : public internal::Derived<FunctionType, internal::Derivative::divergence>
 {
@@ -261,7 +255,6 @@ public:
   }
 }; // class Divergence
 
-
 template <class T, class... Args>
 std::shared_ptr<Divergence<T>> make_divergence(const T& func, Args&&... args)
 {
@@ -274,7 +267,6 @@ std::shared_ptr<Divergence<T>> make_divergence(std::shared_ptr<T> func, Args&&..
   return std::make_shared<Divergence<T>>(func, std::forward<Args>(args)...);
 }
 
-
 } // namespace Functions
 } // namespace Stuff
 } // namespace Dune
diff --git a/dune/stuff/functions/expression.hh b/dune/stuff/functions/expression.hh
index ebfd6c2b15fb81de8f9c115771b267da9cbaee1c..4ad3302480f55b8a5ee412fdd4e2f30993f44c14 100644
--- a/dune/stuff/functions/expression.hh
+++ b/dune/stuff/functions/expression.hh
@@ -25,7 +25,6 @@ namespace Dune {
 namespace Stuff {
 namespace Functions {
 
-
 template <class EntityImp, class DomainFieldImp, size_t domainDim, class RangeFieldImp, size_t rangeDim,
           size_t rangeDimCols = 1>
 class Expression
@@ -388,7 +387,6 @@ private:
   std::vector<std::vector<std::shared_ptr<const MathExpressionGradientType>>> gradients_;
 }; // class Expression
 
-
 } // namespace Functions
 } // namespace Stuff
 } // namespace Dune
diff --git a/dune/stuff/functions/expression/base.hh b/dune/stuff/functions/expression/base.hh
index 1c570e111df4b73a3a867509960ab0f0681f076a..ec66a4c3b09602bead59a8c2ede5a36bf75644d6 100644
--- a/dune/stuff/functions/expression/base.hh
+++ b/dune/stuff/functions/expression/base.hh
@@ -24,7 +24,6 @@ namespace Dune {
 namespace Stuff {
 namespace Functions {
 
-
 /**
  *  \brief base class that makes a function out of the stuff from mathexpr.hh
  *  \attention  Most surely you do not want to use this class directly, but Functions::Expression!
@@ -211,7 +210,6 @@ private:
   ROperation* op_[dimRange];
 }; // class MathExpressionBase
 
-
 } // namespace Functions
 } // namespace Stuff
 } // namespace Dune
diff --git a/dune/stuff/functions/femadapter.hh b/dune/stuff/functions/femadapter.hh
index a13debcabd35679d8678ea3cdeefa2b9389a4092..2ca280534d6280499264cb62b73c0ac14c261d9f 100644
--- a/dune/stuff/functions/femadapter.hh
+++ b/dune/stuff/functions/femadapter.hh
@@ -16,7 +16,6 @@ namespace Dune {
 namespace Stuff {
 namespace Functions {
 
-
 template <class DiscreteFunctionType>
 class FemAdapter
     : public LocalizableFunctionInterface<
@@ -117,7 +116,6 @@ private:
   const DiscreteFunctionType& df_;
 }; // class Checkerboard
 
-
 } // namespace Functions
 } // namespace Stuff
 } // namespace Dune
diff --git a/dune/stuff/functions/flattop.hh b/dune/stuff/functions/flattop.hh
index f25b66bc0e3e17419623c19f2347f9307395dd89..d6102db0e28ffc2d3b484b8918e86aff1153101e 100644
--- a/dune/stuff/functions/flattop.hh
+++ b/dune/stuff/functions/flattop.hh
@@ -18,7 +18,6 @@ namespace Dune {
 namespace Stuff {
 namespace Functions {
 
-
 /**
  * Based on: Brenner, S. C. and Davis, C. B. and Sung, L.-y.
  *           A partition of unity method for the displacement obstacle problem of clamped Kirchhoff plates
@@ -34,7 +33,6 @@ class FlatTop : public LocalizableFunctionInterface<E, D, d, R, r, rC>
   }
 };
 
-
 template <class E, class D, size_t d, class R>
 class FlatTop<E, D, d, R, 1, 1> : public GlobalFunctionInterface<E, D, d, R, 1, 1>
 {
@@ -210,7 +208,6 @@ private:
   const std::string name_;
 }; // class FlatTop< ..., 1, 1 >
 
-
 } // namespace Functions
 } // namespace Stuff
 } // namespace Dune
diff --git a/dune/stuff/functions/global.hh b/dune/stuff/functions/global.hh
index 5eee35a18ebd769c316e8f7db89d905f3bca391b..7892df9f600b177189f2be3a99b69ac0fa9ec8af 100644
--- a/dune/stuff/functions/global.hh
+++ b/dune/stuff/functions/global.hh
@@ -16,7 +16,6 @@
 namespace Dune {
 namespace Stuff {
 
-
 /**
  * Global-valued function you can pass a lambda expression to that gets evaluated
  * \example LambdaType lambda([](DomainType x) { return x;}, 1 );
@@ -74,7 +73,6 @@ private:
   const std::string name_;
 };
 
-
 } // namespace Stuff
 } // namespace Dune
 
diff --git a/dune/stuff/functions/indicator.hh b/dune/stuff/functions/indicator.hh
index 5fe128ba4c6e611bf599ce314959bed10b0769e1..6c8e9a890308ed3230088afa6ee28c29fa606dd8 100644
--- a/dune/stuff/functions/indicator.hh
+++ b/dune/stuff/functions/indicator.hh
@@ -23,7 +23,6 @@ namespace Dune {
 namespace Stuff {
 namespace Functions {
 
-
 template <class E, class D, size_t d, class R, size_t r, size_t rC = 1>
 class Indicator : public LocalizableFunctionInterface<E, D, d, R, r, rC>
 {
@@ -33,7 +32,6 @@ class Indicator : public LocalizableFunctionInterface<E, D, d, R, r, rC>
   }
 };
 
-
 template <class E, class D, size_t d, class R>
 class Indicator<E, D, d, R, 1> : public LocalizableFunctionInterface<E, D, d, R, 1>
 {
@@ -185,7 +183,6 @@ private:
   const std::string name_;
 }; // class Indicator
 
-
 } // namespace Functions
 } // namespace Stuff
 } // namespace Dune
diff --git a/dune/stuff/functions/interfaces.hh b/dune/stuff/functions/interfaces.hh
index 71406637f2b9cb9364c2033919e0ac28ab7224ac..4bf875009e84ff4f78aa808e212bc97c9bed9fc1 100644
--- a/dune/stuff/functions/interfaces.hh
+++ b/dune/stuff/functions/interfaces.hh
@@ -45,7 +45,6 @@ namespace Dune {
 namespace Stuff {
 namespace internal {
 
-
 template <class F>
 struct is_localizable_function_helper
 {
@@ -59,19 +58,15 @@ struct is_localizable_function_helper
                           && DSC_has_static_member(dimRange)<F>::value && DSC_has_static_member(dimRangeCols)<F>::value;
 }; // class is_localizable_function_helper
 
-
 } // namespace internal
 
-
 // forwards, includes are below
 template <class F, bool candidate = internal::is_localizable_function_helper<F>::is_candidate>
 struct is_localizable_function;
 
-
 namespace Functions {
 namespace internal {
 
-
 // additional argument for member functions to differentiate between dimRangeCols = 1 and dimRangeCols > 1 by
 // overloading
 template <size_t rangeDimCols>
@@ -79,20 +74,15 @@ struct ChooseVariant
 {
 };
 
-
 } // namespace internal
 
-
 #if HAVE_DUNE_GRID
 
-
 template <class GridViewType, size_t dimRange, size_t dimRangeCols = 1>
 class VisualizationAdapter;
 
-
 #endif // HAVE_DUNE_GRID
 
-
 template <class MinuendType, class SubtrahendType>
 class Difference;
 
@@ -105,19 +95,15 @@ class Product;
 template <class FunctionImp>
 class Divergence;
 
-
 } // namespace Functions
 namespace Tags {
 
-
 class LocalizableFunction
 {
 };
 
-
 } // namespace Tags
 
-
 /**
  *  \brief Interface for a set of globalvalued functions, which can be evaluated locally on one Entity.
  */
@@ -230,7 +216,6 @@ protected:
   const EntityType& entity_;
 }; // class LocalfunctionSetInterface
 
-
 /**
  *  \brief  Interface for functions, which can be evaluated locally on one Entity.
  */
@@ -329,12 +314,10 @@ public:
   /* @} */
 }; // class LocalfunctionInterface
 
-
 class IsLocalizableFunction
 {
 };
 
-
 /**
  * \brief Interface for functions which provide a LocalfunctionInterface for an entity.
  */
@@ -455,7 +438,6 @@ private:
   friend std::ostream& operator<<(std::ostream& /*out*/, const ThisType& /*function*/);
 }; // class LocalizableFunctionInterface
 
-
 template <class E, class D, size_t d, class R, size_t r, size_t rC>
 std::ostream& operator<<(std::ostream& out, const LocalizableFunctionInterface<E, D, d, R, r, rC>& function)
 {
@@ -463,11 +445,9 @@ std::ostream& operator<<(std::ostream& out, const LocalizableFunctionInterface<E
   return out;
 } // ... operator<<(...)
 
-
 template <class OtherEntityImp, class GlobalFunctionImp>
 class TransferredGlobalFunction;
 
-
 /**
  * base class for global matrix-valued valued functions that provides automatic local functions via
  * LocalizableFunctionInterface
@@ -580,7 +560,6 @@ public:
   }
 }; // class GlobalFunctionInterface
 
-
 /**
  * base class for global valued functions that provides automatic local functions via LocalizableFunctionInterface
  */
@@ -742,7 +721,6 @@ private:
   const GlobalFunctionImp& function_;
 }; // class TransferredGlobalFunction
 
-
 //! Utility to generate a complete Function Type from an existing one and a template
 template <class FunctionImp, template <class, class, size_t, class, size_t, size_t> class OutTemplate>
 struct FunctionTypeGenerator
@@ -751,7 +729,6 @@ struct FunctionTypeGenerator
                       typename FunctionImp::RangeFieldType, FunctionImp::dimRange, FunctionImp::dimRangeCols> type;
 };
 
-
 template <class F>
 struct is_localizable_function<F, true>
     : public std::is_base_of<LocalizableFunctionInterface<typename F::EntityType, typename F::DomainFieldType,
@@ -761,13 +738,11 @@ struct is_localizable_function<F, true>
 {
 };
 
-
 template <class F>
 struct is_localizable_function<F, false> : public std::false_type
 {
 };
 
-
 } // namespace Stuff
 } // namespace Dune
 
diff --git a/dune/stuff/functions/random_ellipsoids_function.hh b/dune/stuff/functions/random_ellipsoids_function.hh
index a0036cb174b1836340f8f4c195a68def415ebffc..57591efed3ec4bdef13d6d23cdf28e8364095cca 100644
--- a/dune/stuff/functions/random_ellipsoids_function.hh
+++ b/dune/stuff/functions/random_ellipsoids_function.hh
@@ -297,7 +297,6 @@ private:
   std::vector<EllipsoidType> ellipsoids_;
 }; // class RandomEllipsoidsFunction
 
-
 } // namespace Functions
 } // namespace Stuff
 } // namespace Dune
diff --git a/dune/stuff/functions/spe10.hh b/dune/stuff/functions/spe10.hh
index 4b798b5fb0dca9b12e94c34037e9a32df2354afa..1341a6fa1e201dfd7a733b215b3b926e9c71e898 100644
--- a/dune/stuff/functions/spe10.hh
+++ b/dune/stuff/functions/spe10.hh
@@ -18,23 +18,19 @@
 
 #include "checkerboard.hh"
 
-
 namespace Dune {
 namespace Stuff {
 namespace Exceptions {
 
-
 class spe10_data_file_missing : public Dune::IOError
 {
 };
 
-
 } // namespace Exceptions
 namespace Functions {
 namespace Spe10 {
 namespace internal {
 
-
 static const std::string model1_filename = "perm_case1.dat";
 static const size_t model1_x_elements    = 100;
 static const size_t model1_y_elements    = 1;
@@ -45,7 +41,6 @@ static const double model_1_length_z     = 15.24;
 static const double model1_min_value     = 0.001;
 static const double model1_max_value     = 998.915;
 
-
 template <class EntityImp, class DomainFieldImp, class RangeFieldImp, size_t r, size_t rC>
 class Model1Base : public Checkerboard<EntityImp, DomainFieldImp, 2, RangeFieldImp, r, rC>
 {
@@ -144,10 +139,8 @@ public:
   }
 }; // class Model1Base
 
-
 } // namespace internal
 
-
 // default, to allow for specialization
 template <class E, class D, size_t d, class R, size_t r, size_t rC = 1>
 class Model1 : public LocalizableFunctionInterface<E, D, d, R, r, rC>
@@ -158,7 +151,6 @@ class Model1 : public LocalizableFunctionInterface<E, D, d, R, r, rC>
   }
 };
 
-
 /**
  * We read only the Kx values from file and scale the unit matrix atm.
  */
@@ -217,7 +209,6 @@ private:
   }
 }; // class Model1< ..., 2, ..., r, r >
 
-
 } // namespace Spe10
 } // namespace Functions
 } // namespace Stuff
diff --git a/dune/stuff/test/functions.hh b/dune/stuff/test/functions.hh
index bc7d4d28eb8b6b9f66c28979e79c85a68893fa9f..3e4029fe3829bf59c55e3feb1ad20273f1d233c9 100644
--- a/dune/stuff/test/functions.hh
+++ b/dune/stuff/test/functions.hh
@@ -18,7 +18,6 @@
 namespace Dune {
 namespace Stuff {
 
-
 template <class FunctionImp>
 class FunctionTest : public ::testing::Test
 {
@@ -73,7 +72,6 @@ protected:
 
 }; // class FunctionTest
 
-
 } // namespace Stuff
 } // namespace Dune
 
diff --git a/dune/stuff/test/functions_ESV2007.cc b/dune/stuff/test/functions_ESV2007.cc
index 2a447a38281c0d42a868a740e919344dec2b1e12..255ce5dd78a3ec8fd71085322f8a8d1e6d3cf909 100644
--- a/dune/stuff/test/functions_ESV2007.cc
+++ b/dune/stuff/test/functions_ESV2007.cc
@@ -12,7 +12,6 @@
 #include <dune/stuff/functions/interfaces.hh>
 #include <dune/stuff/functions/ESV2007.hh>
 
-
 // we need this nasty code generation because the testing::Types< ... > only accepts 50 arguments
 // and all combinations of functions and entities and dimensions and fieldtypes would be way too much
 #define TEST_STRUCT_GENERATOR(ftype, etype)                                                                            \
@@ -38,7 +37,6 @@
   };
 // TEST_STRUCT_GENERATOR
 
-
 #if HAVE_DUNE_GRID
 
 #include <dune/grid/yaspgrid.hh>
diff --git a/dune/stuff/test/functions_checkerboard.cc b/dune/stuff/test/functions_checkerboard.cc
index a8c923e9abdbb0d24f8a33e7651cc35d319bf2aa..db645e67f861364db3ea3147dd5190d8c4650c78 100644
--- a/dune/stuff/test/functions_checkerboard.cc
+++ b/dune/stuff/test/functions_checkerboard.cc
@@ -12,7 +12,6 @@
 #include <dune/stuff/functions/interfaces.hh>
 #include <dune/stuff/functions/checkerboard.hh>
 
-
 // we need this nasty code generation because the testing::Types< ... > only accepts 50 arguments
 // and all combinations of functions and entities and dimensions and fieldtypes would be way too much
 #define TEST_STRUCT_GENERATOR(ftype, etype)                                                                            \
@@ -38,7 +37,6 @@
   };
 // TEST_STRUCT_GENERATOR
 
-
 #if HAVE_DUNE_GRID
 
 #include <dune/grid/yaspgrid.hh>
diff --git a/dune/stuff/test/functions_combined.cc b/dune/stuff/test/functions_combined.cc
index ed77358e65fdf69ad9c98d6bea7cb035dd3e16f4..02242ebb63ca4f0af6ada95f892f39e7335f5160 100644
--- a/dune/stuff/test/functions_combined.cc
+++ b/dune/stuff/test/functions_combined.cc
@@ -27,7 +27,6 @@
 using namespace Dune;
 using namespace Stuff;
 
-
 template <class G>
 class DifferenceFunctionType
 {
@@ -43,7 +42,6 @@ public:
   typedef Functions::Difference<ConstantFunctionType, ConstantFunctionType> value;
 }; // struct DifferenceFunctionType
 
-
 template <class DimDomain>
 class DifferenceFunctionTest
     : public FunctionTest<
@@ -70,7 +68,6 @@ protected:
   } // ... create(...)
 }; // class DifferenceFunctionTest
 
-
 typedef testing::Types<Int<1>, Int<2>, Int<3>> DimDomains;
 
 TYPED_TEST_CASE(DifferenceFunctionTest, DimDomains);
@@ -99,7 +96,6 @@ TYPED_TEST(DifferenceFunctionTest, evaluate_check)
   }
 } // DifferenceFunctionTest, evaluate_check
 
-
 #else // HAVE_DUNE_GRID
 
 // no-compile placeholders to mark disabled tests in test-binary output
diff --git a/dune/stuff/test/functions_constant.cc b/dune/stuff/test/functions_constant.cc
index 3271708153ea67371fdf69aa404823160d8d60d4..82c5e510c7911dcc345b84ccd93b4db6e9581f98 100644
--- a/dune/stuff/test/functions_constant.cc
+++ b/dune/stuff/test/functions_constant.cc
@@ -12,7 +12,6 @@
 #include <dune/stuff/functions/interfaces.hh>
 #include <dune/stuff/functions/constant.hh>
 
-
 // we need this nasty code generation because the testing::Types< ... > only accepts 50 arguments
 // and all combinations of functions and entities and dimensions and fieldtypes would be way too much
 #define TEST_STRUCT_GENERATOR(ftype, etype)                                                                            \
diff --git a/dune/stuff/test/functions_expression.cc b/dune/stuff/test/functions_expression.cc
index cb9dfe26fa3299d1b1ca7b86f7a77bcb9fa6b73d..0041c78969e28e9bd6d4a7fb63e6e9ce97cd3e93 100644
--- a/dune/stuff/test/functions_expression.cc
+++ b/dune/stuff/test/functions_expression.cc
@@ -12,7 +12,6 @@
 #include <dune/stuff/functions/interfaces.hh>
 #include <dune/stuff/functions/expression.hh>
 
-
 // we need this nasty code generation because the testing::Types< ... > only accepts 50 arguments
 // and all combinations of functions and entities and dimensions and fieldtypes would be way too much
 #define TEST_STRUCT_GENERATOR(ftype, etype)                                                                            \
@@ -45,7 +44,6 @@
   };
 // TEST_STRUCT_GENERATOR
 
-
 #if HAVE_DUNE_GRID
 
 #include <dune/grid/yaspgrid.hh>
diff --git a/dune/stuff/test/functions_flattop.cc b/dune/stuff/test/functions_flattop.cc
index ad5389f507973424ace4659b5f0773c6161cd976..ad1182113716bf381f931b893c1de95c124595b5 100644
--- a/dune/stuff/test/functions_flattop.cc
+++ b/dune/stuff/test/functions_flattop.cc
@@ -32,7 +32,6 @@
 using namespace Dune;
 using namespace Stuff;
 
-
 template <class G>
 class FlatTopFunctionType
 {
@@ -47,7 +46,6 @@ public:
   typedef Functions::FlatTop<E, D, d, R, r, rC> value;
 }; // struct FlatTopFunctionType
 
-
 template <class DimDomain>
 class FlatTopFunctionTest
     : public FunctionTest<
@@ -85,7 +83,6 @@ protected:
   } // ... check(...)
 }; // class FlatTopFunctionTest
 
-
 typedef testing::Types<Int<1>, Int<2>, Int<3>> DimDomains;
 
 TYPED_TEST_CASE(FlatTopFunctionTest, DimDomains);
@@ -124,7 +121,6 @@ TYPED_TEST(FlatTopFunctionTest, evaluate_check)
   }
 }
 
-
 #else // HAVE_DUNE_GRID
 
 // no-compile placeholders to mark disabled tests in test-binary output
diff --git a/dune/stuff/test/functions_functions.cc b/dune/stuff/test/functions_functions.cc
index 9b675548656045abb9c97cc891662e344e43c44c..84a22735d72c5db91e2be63ac752ea2b93ba0615 100644
--- a/dune/stuff/test/functions_functions.cc
+++ b/dune/stuff/test/functions_functions.cc
@@ -11,7 +11,6 @@
 
 #include <dune/stuff/functions.hh>
 
-
 // we need this nasty code generation because the testing::Types< ... > only accepts 50 arguments
 // and all combinations of functions and entities and dimensions and fieldtypes would be way too much
 #define TEST_STRUCT_GENERATOR(ftype, etype)                                                                            \
@@ -42,7 +41,6 @@
   };
 // TEST_STRUCT_GENERATOR
 
-
 #if HAVE_DUNE_GRID
 
 #include <dune/grid/yaspgrid.hh>
diff --git a/dune/stuff/test/functions_global.cc b/dune/stuff/test/functions_global.cc
index b4ccfa5c026fe95065be8989e4431081be577e4a..67a2fe8d82093cab194c8fb9f7eaa7b6e74b4b34 100644
--- a/dune/stuff/test/functions_global.cc
+++ b/dune/stuff/test/functions_global.cc
@@ -12,7 +12,6 @@
 #include <dune/stuff/functions/interfaces.hh>
 #include <dune/stuff/functions/global.hh>
 
-
 // we need this nasty code generation because the testing::Types< ... > only accepts 50 arguments
 // and all combinations of functions and entities and dimensions and fieldtypes would be way too much
 #define TEST_STRUCT_GENERATOR(ftype, etype)                                                                            \
@@ -42,7 +41,6 @@
   };
 // TEST_STRUCT_GENERATOR
 
-
 #if HAVE_DUNE_GRID
 
 #include <dune/grid/yaspgrid.hh>
diff --git a/dune/stuff/test/functions_indicator.cc b/dune/stuff/test/functions_indicator.cc
index c3a051abfe3b9834325582ed1a1b4f19931ba4a4..e6d96de999d2f0002694f2d45a2a15574a59cae9 100644
--- a/dune/stuff/test/functions_indicator.cc
+++ b/dune/stuff/test/functions_indicator.cc
@@ -12,7 +12,6 @@
 #include <dune/stuff/functions/interfaces.hh>
 #include <dune/stuff/functions/indicator.hh>
 
-
 // we need this nasty code generation because the testing::Types< ... > only accepts 50 arguments
 // and all combinations of functions and entities and dimensions and fieldtypes would be way too much
 #define TEST_STRUCT_GENERATOR(ftype, etype)                                                                            \
@@ -38,7 +37,6 @@
   };
 // TEST_STRUCT_GENERATOR
 
-
 #if HAVE_DUNE_GRID
 
 #include <dune/grid/yaspgrid.hh>
diff --git a/dune/stuff/test/functions_spe10.cc b/dune/stuff/test/functions_spe10.cc
index 818a6096c3d5a87b12b5f94a8fa387480db41949..867ad324733a53a8ca948d8622227c2926eab2df 100644
--- a/dune/stuff/test/functions_spe10.cc
+++ b/dune/stuff/test/functions_spe10.cc
@@ -37,7 +37,6 @@
   };
 // TEST_STRUCT_GENERATOR
 
-
 #if HAVE_DUNE_GRID
 
 //# include <dune/grid/yaspgrid.hh>