diff --git a/Plugins/ZShell/Blobs/blobmaterial.cpp b/Plugins/ZShell/Blobs/blobmaterial.cpp
index e32b25e..cdd5cd7 100644
--- a/Plugins/ZShell/Blobs/blobmaterial.cpp
+++ b/Plugins/ZShell/Blobs/blobmaterial.cpp
@@ -1,7 +1,6 @@
 #include "blobmaterial.hpp"
 
-#include <math.h>
-
+#include <cmath>
 #include <cstring>
 
 static_assert(
diff --git a/Plugins/ZShell/Internal/circularindicatormanager.cpp b/Plugins/ZShell/Internal/circularindicatormanager.cpp
index fcff143..0d3a1b8 100644
--- a/Plugins/ZShell/Internal/circularindicatormanager.cpp
+++ b/Plugins/ZShell/Internal/circularindicatormanager.cpp
@@ -89,17 +89,15 @@ void CircularIndicatorManager::setProgress(qreal progress) {
 qreal CircularIndicatorManager::duration() const {
 	if (m_type == IndeterminateAnimationType::Advance) {
 		return advance::TOTAL_DURATION_IN_MS;
-	} else {
-		return retreat::TOTAL_DURATION_IN_MS;
 	}
+	return retreat::TOTAL_DURATION_IN_MS;
 }
 
 qreal CircularIndicatorManager::completeEndDuration() const {
 	if (m_type == IndeterminateAnimationType::Advance) {
 		return advance::DURATION_TO_COMPLETE_END_IN_MS;
-	} else {
-		return retreat::DURATION_TO_COMPLETE_END_IN_MS;
-	}
+	}  		return retreat::DURATION_TO_COMPLETE_END_IN_MS;
+
 }
 
 CircularIndicatorManager::IndeterminateAnimationType