Index: src/ch/Theme Helpers.cpp
===================================================================
diff -u -N -r8068e0c351055554340ac9755d1bc846893bf2b8 -r9ddf8fdd5f641491dd30c49eb90f8f740314b6af
--- src/ch/Theme Helpers.cpp	(.../Theme Helpers.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
+++ src/ch/Theme Helpers.cpp	(.../Theme Helpers.cpp)	(revision 9ddf8fdd5f641491dd30c49eb90f8f740314b6af)
@@ -44,8 +44,8 @@
 
 	if (pfnProc)
 		return (*pfnProc)(hwnd, pszClassList);
-	else
-		return nullptr;
+
+	return nullptr;
 }
 
 HRESULT CUxThemeSupport::CloseThemeData(HTHEME hTheme)
@@ -58,8 +58,8 @@
 
 	if (pfnProc)
 		return (*pfnProc)(hTheme);
-	else
-		return E_UNEXPECTED;
+
+	return E_UNEXPECTED;
 }
 
 HRESULT CUxThemeSupport::DrawThemeEdge(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, const RECT* pDestRect, UINT uEdge, UINT uFlags, RECT* pContentRect)
@@ -72,8 +72,8 @@
 
 	if (pfnProc)
 		return (*pfnProc)(hTheme, hdc, iPartId, iStateId, pDestRect, uEdge, uFlags, pContentRect);
-	else
-		return E_UNEXPECTED;
+
+	return E_UNEXPECTED;
 }
 
 HRESULT CUxThemeSupport::DrawThemeBackground(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, const RECT *pRect, OPTIONAL const RECT *pClipRect)
@@ -86,8 +86,8 @@
 
 	if (pfnProc)
 		return (*pfnProc)(hTheme, hdc, iPartId, iStateId, pRect, pClipRect);
-	else
-		return E_UNEXPECTED;
+
+	return E_UNEXPECTED;
 }
 
 HRESULT CUxThemeSupport::DrawThemeParentBackground(HWND hwnd, HDC hdc, RECT* prc)
@@ -100,8 +100,8 @@
 
 	if (pfnProc)
 		return (*pfnProc)(hwnd, hdc, prc);
-	else
-		return E_UNEXPECTED;
+
+	return E_UNEXPECTED;
 }
 
 BOOL CUxThemeSupport::IsAppThemed()
@@ -114,6 +114,6 @@
 
 	if (pfnProc)
 		return (*pfnProc)();
-	else
-		return FALSE;
+
+	return FALSE;
 }