diff --git a/ProcessLib/BoundaryCondition/Python/BHEInflowPythonBoundaryCondition.h b/ProcessLib/BoundaryCondition/Python/BHEInflowPythonBoundaryCondition.h
index ef3840bf86cd096824636d49ca52f5559374ecd7..4430aac21485bb77023b83df367cadf197a11be7 100644
--- a/ProcessLib/BoundaryCondition/Python/BHEInflowPythonBoundaryCondition.h
+++ b/ProcessLib/BoundaryCondition/Python/BHEInflowPythonBoundaryCondition.h
@@ -1,4 +1,5 @@
 /**
+ * \file
  * \copyright
  * Copyright (c) 2012-2019, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
diff --git a/ProcessLib/BoundaryCondition/Python/BHEInflowPythonBoundaryConditionPythonSideInterface.h b/ProcessLib/BoundaryCondition/Python/BHEInflowPythonBoundaryConditionPythonSideInterface.h
index a45a7532af166acea1b1b38c332a4ec3506e3e57..dab8626ad349a9d4e712bc2fc60f20d0c1aa9384 100644
--- a/ProcessLib/BoundaryCondition/Python/BHEInflowPythonBoundaryConditionPythonSideInterface.h
+++ b/ProcessLib/BoundaryCondition/Python/BHEInflowPythonBoundaryConditionPythonSideInterface.h
@@ -1,4 +1,5 @@
 /**
+ * \file
  * \copyright
  * Copyright (c) 2012-2019, OpenGeoSys Community (http://www.opengeosys.org)
  *            Distributed under a Modified BSD License.
diff --git a/ProcessLib/HeatTransportBHE/BHE/FlowAndTemperatureControl.h b/ProcessLib/HeatTransportBHE/BHE/FlowAndTemperatureControl.h
index 314e68142a660364d2e5160a4b581e7964bb42be..e7d50bdb78579dd495c63ce225279a4ad8056f1f 100644
--- a/ProcessLib/HeatTransportBHE/BHE/FlowAndTemperatureControl.h
+++ b/ProcessLib/HeatTransportBHE/BHE/FlowAndTemperatureControl.h
@@ -72,11 +72,7 @@ struct PowerCurveConstantFlow
         {
             return {0.0, T_out};
         }
-        else
-        {
-            return {flow_rate,
-                    power / flow_rate / heat_capacity / density + T_out};
-        }
+        return {flow_rate, power / flow_rate / heat_capacity / density + T_out};
     }
     MathLib::PiecewiseLinearInterpolation const& power_curve;
 
diff --git a/ProcessLib/HeatTransportBHE/CMakeLists.txt b/ProcessLib/HeatTransportBHE/CMakeLists.txt
index 8e8fd364eb69ab35920a6b560e99dfba47e38cba..5cfb04c4de630b59b857e7231b96587ec149fba5 100644
--- a/ProcessLib/HeatTransportBHE/CMakeLists.txt
+++ b/ProcessLib/HeatTransportBHE/CMakeLists.txt
@@ -5,10 +5,9 @@ append_source_files(SOURCES LocalAssemblers)
 
 add_library(HeatTransportBHE ${SOURCES})
 
-if(OGS_USE_PYTHON)
-    target_link_libraries(HeatTransportBHE PUBLIC ProcessLib PRIVATE pybind11::pybind11)
-else()
-    target_link_libraries(HeatTransportBHE PUBLIC ProcessLib)
+target_link_libraries(HeatTransportBHE PUBLIC ProcessLib)
+if (OGS_USE_PYTHON)
+    target_link_libraries(HeatTransportBHE PRIVATE pybind11::pybind11)
 endif()
 
 if(BUILD_SHARED_LIBS)
diff --git a/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp b/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp
index 3900c35a2ec7e47d4881c9c21538308f96630f4d..9c363d00c0daf8e8976b7e2dfc95af32be0f4dbb 100644
--- a/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp
+++ b/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp
@@ -23,7 +23,7 @@
 #ifdef OGS_USE_PYTHON
 #include <pybind11/pybind11.h>
 #endif  // OGS_USE_PYTHON
-#include <iostream>
+
 namespace ProcessLib
 {
 namespace HeatTransportBHE