diff --git a/src/CalcManager/UnitConverter.cpp b/src/CalcManager/UnitConverter.cpp
index d8a2865a..57cd49bd 100644
--- a/src/CalcManager/UnitConverter.cpp
+++ b/src/CalcManager/UnitConverter.cpp
@@ -215,7 +215,7 @@ vector<wstring> UnitConverter::StringToVector(const wstring& w, const wchar_t* d
     }
     return serializedTokens;
 }
-wstring UnitConverter::UnitToString(const Unit& u, const wchar_t * delimiter)
+wstring UnitConverter::UnitToString(const Unit& u, const wchar_t* delimiter)
 {
     wstringstream out(wstringstream::out);
     out << Quote(std::to_wstring(u.id)) << delimiter << Quote(u.name) << delimiter << Quote(u.abbreviation) << delimiter
diff --git a/src/CalcViewModel/StandardCalculatorViewModel.cpp b/src/CalcViewModel/StandardCalculatorViewModel.cpp
index 45e63d85..0ff5893f 100644
--- a/src/CalcViewModel/StandardCalculatorViewModel.cpp
+++ b/src/CalcViewModel/StandardCalculatorViewModel.cpp
@@ -1152,7 +1152,7 @@ void StandardCalculatorViewModel::OnMemoryClear(_In_ Object ^ memoryItemPosition
     }
 }
 
-void StandardCalculatorViewModel::OnPropertyChanged(String^ propertyname)
+void StandardCalculatorViewModel::OnPropertyChanged(String ^ propertyname)
 {
     if (propertyname == IsScientificPropertyName)
     {
diff --git a/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp b/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp
index c6472fc6..4e91e619 100644
--- a/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp
+++ b/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.cpp
@@ -833,22 +833,22 @@ TEST_METHOD(TestSupplementaryResultsWhimsicalUnits)
     suggestedList.push_back(tuple<wstring, UCM::Unit>(L"", unitWhimSubsequent));
     suggestedList.push_back(tuple<wstring, UCM::Unit>(L"", unit));
 
-            vm.UpdateSupplementaryResults(suggestedList);
-            WaitForSingleObjectEx(GetCurrentThread(), 1100, FALSE);
-            VERIFY_ARE_EQUAL((UINT)6, vm.SupplementaryResults->Size);
-            while (vm.SupplementaryResults->Size > 1)
-            {
-                VERIFY_IS_FALSE(vm.SupplementaryResults->GetAt(0)->IsWhimsical());
-                vm.SupplementaryResults->RemoveAt(0);
-            }
-            // Last item
-            VERIFY_IS_TRUE(vm.SupplementaryResults->GetAt(0)->Unit->GetModelUnit() == UNITWHIMSY);
-        }
+    vm.UpdateSupplementaryResults(suggestedList);
+    WaitForSingleObjectEx(GetCurrentThread(), 1100, FALSE);
+    VERIFY_ARE_EQUAL((UINT)6, vm.SupplementaryResults->Size);
+    while (vm.SupplementaryResults->Size > 1)
+    {
+        VERIFY_IS_FALSE(vm.SupplementaryResults->GetAt(0)->IsWhimsical());
+        vm.SupplementaryResults->RemoveAt(0);
+    }
+    // Last item
+    VERIFY_IS_TRUE(vm.SupplementaryResults->GetAt(0)->Unit->GetModelUnit() == UNITWHIMSY);
+}
 
-        TEST_METHOD(TestOnPaste)
-        {
-            shared_ptr<UnitConverterMock> mock = make_shared<UnitConverterMock>();
-            VM::UnitConverterViewModel vm(mock);
+TEST_METHOD(TestOnPaste)
+{
+    shared_ptr<UnitConverterMock> mock = make_shared<UnitConverterMock>();
+    VM::UnitConverterViewModel vm(mock);
 
     // Call count is being set to 1 because we send 'CE' command as the first call in OnPaste method of the ViewModel
     UINT callCount = 1;
diff --git a/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.h b/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.h
index 52a76a28..08c0f954 100644
--- a/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.h
+++ b/src/CalculatorUnitTests/UnitConverterViewModelUnitTests.h
@@ -60,7 +60,6 @@ namespace CalculatorUnitTests
         UINT m_sendCommandCallCount;
         UINT m_setVMCallbackCallCount;
 
-
         UCM::Category m_curCategory;
         UCM::Unit m_curFrom;
         UCM::Unit m_curTo;