diff --git a/src/CalcManager/CEngine/scicomm.cpp b/src/CalcManager/CEngine/scicomm.cpp
index 42b70ba2..2fd91965 100644
--- a/src/CalcManager/CEngine/scicomm.cpp
+++ b/src/CalcManager/CEngine/scicomm.cpp
@@ -18,7 +18,6 @@
 #include <sstream>
 #include "Header Files/CalcEngine.h"
 #include "Header Files/CalcUtils.h"
-#include "NumberFormattingUtils.h"
 
 using namespace std;
 using namespace CalcEngine;
diff --git a/src/CalcManager/NumberFormattingUtils.cpp b/src/CalcManager/NumberFormattingUtils.cpp
index 63563972..3c5b9feb 100644
--- a/src/CalcManager/NumberFormattingUtils.cpp
+++ b/src/CalcManager/NumberFormattingUtils.cpp
@@ -3,7 +3,7 @@
 
 using namespace std;
 
-namespace CalcManager::NumberFormattingUtils
+namespace UnitConversionManager::NumberFormattingUtils
 {
     /// <summary>
     /// Trims out any trailing zeros or decimals in the given input string
diff --git a/src/CalcManager/NumberFormattingUtils.h b/src/CalcManager/NumberFormattingUtils.h
index f5587fe6..05585fea 100644
--- a/src/CalcManager/NumberFormattingUtils.h
+++ b/src/CalcManager/NumberFormattingUtils.h
@@ -6,7 +6,7 @@
 #include <string>
 #include "sal_cross_platform.h"
 
-namespace CalcManager::NumberFormattingUtils
+namespace UnitConversionManager::NumberFormattingUtils
 {
     void TrimTrailingZeros(_Inout_ std::wstring& input);
     unsigned int GetNumberDigits(std::wstring value);
diff --git a/src/CalcManager/UnitConverter.cpp b/src/CalcManager/UnitConverter.cpp
index 3d4b1865..41afd272 100644
--- a/src/CalcManager/UnitConverter.cpp
+++ b/src/CalcManager/UnitConverter.cpp
@@ -11,7 +11,7 @@
 
 using namespace std;
 using namespace UnitConversionManager;
-using namespace CalcManager::NumberFormattingUtils;
+using namespace UnitConversionManager::NumberFormattingUtils;
 
 static constexpr uint32_t EXPECTEDSERIALIZEDCATEGORYTOKENCOUNT = 3U;
 static constexpr uint32_t EXPECTEDSERIALIZEDUNITTOKENCOUNT = 6U;
diff --git a/src/CalcViewModel/Common/Utils.cpp b/src/CalcViewModel/Common/Utils.cpp
index 7831b3c3..daae9e86 100644
--- a/src/CalcViewModel/Common/Utils.cpp
+++ b/src/CalcViewModel/Common/Utils.cpp
@@ -13,7 +13,6 @@
 #include "Common/AppResourceProvider.h"
 #include "Common/ExpressionCommandSerializer.h"
 #include "Common/ExpressionCommandDeserializer.h"
-#include "CalcManager/NumberFormattingUtils.h"
 
 using namespace CalculatorApp;
 using namespace CalculatorApp::ViewModel::Common;
diff --git a/src/CalcViewModel/GraphingCalculator/GraphingSettingsViewModel.h b/src/CalcViewModel/GraphingCalculator/GraphingSettingsViewModel.h
index 185c79e0..81bb77fb 100644
--- a/src/CalcViewModel/GraphingCalculator/GraphingSettingsViewModel.h
+++ b/src/CalcViewModel/GraphingCalculator/GraphingSettingsViewModel.h
@@ -53,7 +53,7 @@ namespace CalculatorApp::ViewModel
                 {
                     std::wistringstream input(value->Data());
                     double number;
-                    if (input >> number)
+                    if (input >> number && input.eof())
                     {
                         m_Graph->XAxisMin = m_XMinValue = number;
                         XMinError = false;
@@ -87,7 +87,7 @@ namespace CalculatorApp::ViewModel
                 {
                     std::wistringstream input(value->Data());
                     double number;
-                    if (input >> number)
+                    if (input >> number && input.eof())
                     {
                         m_Graph->XAxisMax = m_XMaxValue = number;
                         XMaxError = false;
@@ -121,7 +121,7 @@ namespace CalculatorApp::ViewModel
                 {
                     std::wistringstream input(value->Data());
                     double number;
-                    if (input >> number)
+                    if (input >> number && input.eof())
                     {
                         m_Graph->YAxisMin = m_YMinValue = number;
                         YMinError = false;
@@ -155,7 +155,7 @@ namespace CalculatorApp::ViewModel
                 {
                     std::wistringstream input(value->Data());
                     double number;
-                    if (input >> number)
+                    if (input >> number && input.eof())
                     {
                         m_Graph->YAxisMax = m_YMaxValue = number;
                         YMaxError = false;
diff --git a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cs b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cs
index a799709d..385ca755 100644
--- a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cs
+++ b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cs
@@ -12,9 +12,7 @@ using CalculatorApp.ViewModel.Common.Automation;
 using CalculatorApp.Controls;
 using CalculatorApp.Utils;
 using CalculatorApp.ViewModel;
-//using CalcManager.NumberFormattingUtils;
 using GraphControl;
-//using Utils;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.ApplicationModel.Resources;
 using Windows.Foundation;
diff --git a/src/CalculatorUnitTests/CalculatorManagerTest.cpp b/src/CalculatorUnitTests/CalculatorManagerTest.cpp
index e1233891..aa1b0fe9 100644
--- a/src/CalculatorUnitTests/CalculatorManagerTest.cpp
+++ b/src/CalculatorUnitTests/CalculatorManagerTest.cpp
@@ -12,7 +12,7 @@
 using namespace CalculatorApp;
 using namespace CalculatorApp::ViewModel::Common;
 using namespace CalculationManager;
-using namespace CalcManager::NumberFormattingUtils;
+using namespace UnitConversionManager::NumberFormattingUtils;
 using namespace Platform;
 using namespace std;
 using namespace Microsoft::VisualStudio::CppUnitTestFramework;
@@ -191,11 +191,11 @@ namespace CalculatorManagerTest
         TEST_METHOD(CalculatorManagerTestMaxDigitsReached_LeadingDecimal);
         TEST_METHOD(CalculatorManagerTestMaxDigitsReached_TrailingDecimal);
 
-        TEST_METHOD(CalculatorManagerNumberFormattingUtils_TrimTrailingZeros);
-        TEST_METHOD(CalculatorManagerNumberFormattingUtils_GetNumberDigits);
-        TEST_METHOD(CalculatorManagerNumberFormattingUtils_GetNumberDigitsWholeNumberPart);
-        TEST_METHOD(CalculatorManagerNumberFormattingUtils_RoundSignificantDigits);
-        TEST_METHOD(CalculatorManagerNumberFormattingUtils_ToScientificNumber);
+        TEST_METHOD(UnitConversionManagerNumberFormattingUtils_TrimTrailingZeros);
+        TEST_METHOD(UnitConversionManagerNumberFormattingUtils_GetNumberDigits);
+        TEST_METHOD(UnitConversionManagerNumberFormattingUtils_GetNumberDigitsWholeNumberPart);
+        TEST_METHOD(UnitConversionManagerNumberFormattingUtils_RoundSignificantDigits);
+        TEST_METHOD(UnitConversionManagerNumberFormattingUtils_ToScientificNumber);
 
         TEST_METHOD(CalculatorManagerTestBinaryOperatorReceived);
         TEST_METHOD(CalculatorManagerTestBinaryOperatorReceived_Multiple);
@@ -917,7 +917,7 @@ namespace CalculatorManagerTest
         TestMaxDigitsReachedScenario(L"123,456,789,101,112.13");
     }
 
-    void CalculatorManagerTest::CalculatorManagerNumberFormattingUtils_TrimTrailingZeros()
+    void CalculatorManagerTest::UnitConversionManagerNumberFormattingUtils_TrimTrailingZeros()
     {
         wstring number = L"2.1032100000000";
         TrimTrailingZeros(number);
@@ -942,7 +942,7 @@ namespace CalculatorManagerTest
         VERIFY_ARE_EQUAL(number, L"322423");
     }
 
-    void CalculatorManagerTest::CalculatorManagerNumberFormattingUtils_GetNumberDigits()
+    void CalculatorManagerTest::UnitConversionManagerNumberFormattingUtils_GetNumberDigits()
     {
         wstring number = L"2.10321";
         unsigned int digitsCount = GetNumberDigits(number);
@@ -961,7 +961,7 @@ namespace CalculatorManagerTest
         VERIFY_ARE_EQUAL(digitsCount, 8);
     }
 
-    void CalculatorManagerTest::CalculatorManagerNumberFormattingUtils_GetNumberDigitsWholeNumberPart()
+    void CalculatorManagerTest::UnitConversionManagerNumberFormattingUtils_GetNumberDigitsWholeNumberPart()
     {
         unsigned int digitsCount = GetNumberDigitsWholeNumberPart(2.10321);
         VERIFY_ARE_EQUAL(digitsCount, 1);
@@ -981,7 +981,7 @@ namespace CalculatorManagerTest
         VERIFY_ARE_EQUAL(digitsCount, 1);
     }
 
-    void CalculatorManagerTest::CalculatorManagerNumberFormattingUtils_RoundSignificantDigits()
+    void CalculatorManagerTest::UnitConversionManagerNumberFormattingUtils_RoundSignificantDigits()
     {
         wstring result = RoundSignificantDigits(12.342343242, 3);
         VERIFY_ARE_EQUAL(result, L"12.342");
@@ -997,7 +997,7 @@ namespace CalculatorManagerTest
         VERIFY_ARE_EQUAL(result, L"0.3423000");
     }
 
-    void CalculatorManagerTest::CalculatorManagerNumberFormattingUtils_ToScientificNumber()
+    void CalculatorManagerTest::UnitConversionManagerNumberFormattingUtils_ToScientificNumber()
     {
         wstring result = ToScientificNumber(3423);
         VERIFY_ARE_EQUAL(result, L"3.423000e+03");