diff --git a/src/CalcManager/CEngine/scicomm.cpp b/src/CalcManager/CEngine/scicomm.cpp
index 99bb27a1..ce01841a 100644
--- a/src/CalcManager/CEngine/scicomm.cpp
+++ b/src/CalcManager/CEngine/scicomm.cpp
@@ -632,7 +632,7 @@ void CCalcEngine::ProcessCommandWorker(WPARAM wParam)
         // Set the "(=xx" indicator.
         if (nullptr != m_pCalcDisplay)
         {
-            m_pCalcDisplay->SetParenthesisNumber(m_openParenCount >= 0 ? (unsigned int)m_openParenCount : 0);
+            m_pCalcDisplay->SetParenthesisNumber(m_openParenCount >= 0 ? static_cast<unsigned int>(m_openParenCount) : 0);
         }
 
         if (!m_bError)
diff --git a/src/CalcViewModel/StandardCalculatorViewModel.cpp b/src/CalcViewModel/StandardCalculatorViewModel.cpp
index 527831e1..944b8d1a 100644
--- a/src/CalcViewModel/StandardCalculatorViewModel.cpp
+++ b/src/CalcViewModel/StandardCalculatorViewModel.cpp
@@ -217,7 +217,9 @@ void StandardCalculatorViewModel::DisplayPasteError()
 void StandardCalculatorViewModel::SetParenthesisCount(_In_ unsigned int parenthesisCount)
 {
     if (m_OpenParenthesisCount == parenthesisCount)
+    {
         return;
+    }
 
     OpenParenthesisCount = parenthesisCount;
     if (IsProgrammer || IsScientific)
diff --git a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp
index d09fb0a0..dd648956 100644
--- a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp
+++ b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp
@@ -99,11 +99,11 @@ void CalculatorProgrammerRadixOperators::IsErrorVisualState::set(bool value)
 }
 
 String^ CalculatorProgrammerRadixOperators::ParenthesisCountToString(unsigned int count) {
-    return count == 0 ? ref new String(L"") : ref new String(to_wstring(count).data());
+    return (count == 0) ? ref new String() : ref new String(to_wstring(count).data());
 }
 
 
-void CalculatorProgrammerRadixOperators::CalculatorProgrammerRadixOperators::OpenParenthesisButton_GotFocus(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
+void CalculatorProgrammerRadixOperators::CalculatorProgrammerRadixOperators::OpenParenthesisButton_GotFocus(Object^ sender, RoutedEventArgs^ e)
 {
     Model->SetOpenParenthesisCountNarratorAnnouncement();
 }
diff --git a/src/Calculator/Views/CalculatorScientificOperators.xaml.cpp b/src/Calculator/Views/CalculatorScientificOperators.xaml.cpp
index 5132b0ff..3d54fb48 100644
--- a/src/Calculator/Views/CalculatorScientificOperators.xaml.cpp
+++ b/src/Calculator/Views/CalculatorScientificOperators.xaml.cpp
@@ -99,11 +99,11 @@ void CalculatorScientificOperators::SetOperatorRowVisibility()
     InvRow2->Visibility = invRowVis;
 }
 
-void CalculatorScientificOperators::OpenParenthesisButton_GotFocus(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
+void CalculatorScientificOperators::OpenParenthesisButton_GotFocus(Object^ sender, RoutedEventArgs^ e)
 {
     Model->SetOpenParenthesisCountNarratorAnnouncement();
 }
 
 String^ CalculatorScientificOperators::ParenthesisCountToString(unsigned int count) {
-    return count == 0 ? ref new String(L"") : ref new String(to_wstring(count).data());
+    return (count == 0) ? ref new String() : ref new String(to_wstring(count).data());
 }