Fix the project code style, as it is not consistent. (#236)

Fixes #202
This PR fixes code style for the project files.

The Problem
Different files in the project use different code style. That is not consistent and leads to harder maintenance of the project.

Description of the changes:
Have investigated and determined the most used code style across the given codebase
Have configured IDE and applied code style to all project files.
Have crafted clang-formatter config.
see https://clang.llvm.org/docs/ClangFormat.html
https://clang.llvm.org/docs/ClangFormatStyleOptions.html
Some cases were fixed manually
How changes were validated:
manual/ad-hoc testing, automated testing

All tests pass as before because these are only code style changes.
Additional
Please review, and let me know if I have any mistake in the code style. In case of any mistake, I will change the configuration and re-apply it to the project.

src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp

@@ -46,21 +46,14 @@ static constexpr auto CACHE_LANGCODE_KEY = L"CURRENCY_CONVERTER_LANGCODE";
 static constexpr auto CACHE_DELIMITER = L"%";
 
 static constexpr auto STATIC_DATA_FILENAME = L"CURRENCY_CONVERTER_STATIC_DATA.txt";
-static constexpr array<wstring_view, 5> STATIC_DATA_PROPERTIES = {
-    wstring_view{ L"CountryCode", 11 },
-    wstring_view{ L"CountryName", 11 },
-    wstring_view{ L"CurrencyCode", 12 },
-    wstring_view{ L"CurrencyName", 12 },
-    wstring_view{ L"CurrencySymbol", 14 }
-};
+static constexpr array<wstring_view, 5> STATIC_DATA_PROPERTIES = { wstring_view{ L"CountryCode", 11 }, wstring_view{ L"CountryName", 11 },
+                                                                   wstring_view{ L"CurrencyCode", 12 }, wstring_view{ L"CurrencyName", 12 },
+                                                                   wstring_view{ L"CurrencySymbol", 14 } };
 
 static constexpr auto ALL_RATIOS_DATA_FILENAME = L"CURRENCY_CONVERTER_ALL_RATIOS_DATA.txt";
 static constexpr auto RATIO_KEY = L"Rt";
 static constexpr auto CURRENCY_CODE_KEY = L"An";
-static constexpr array<wstring_view, 2> ALL_RATIOS_DATA_PROPERTIES = {
-    wstring_view{ RATIO_KEY, 2 },
-    wstring_view{ CURRENCY_CODE_KEY, 2 }
-};
+static constexpr array<wstring_view, 2> ALL_RATIOS_DATA_PROPERTIES = { wstring_view{ RATIO_KEY, 2 }, wstring_view{ CURRENCY_CODE_KEY, 2 } };
 
 static constexpr auto DEFAULT_FROM_TO_CURRENCY_FILE_URI = L"ms-appx:///DataLoaders/DefaultFromToCurrency.json";
 static constexpr auto FROM_KEY = L"from";
@@ -92,14 +85,14 @@ namespace CalculatorApp
     }
 }
 
-CurrencyDataLoader::CurrencyDataLoader(_In_ unique_ptr<ICurrencyHttpClient> client) :
-    m_client(move(client)),
-    m_loadStatus(CurrencyLoadStatus::NotLoaded),
-    m_responseLanguage(L"en-US"),
-    m_ratioFormat(L""),
-    m_timestampFormat(L""),
-    m_networkManager(ref new NetworkManager()),
-    m_meteredOverrideSet(false)
+CurrencyDataLoader::CurrencyDataLoader(_In_ unique_ptr<ICurrencyHttpClient> client)
+    : m_client(move(client))
+    , m_loadStatus(CurrencyLoadStatus::NotLoaded)
+    , m_responseLanguage(L"en-US")
+    , m_ratioFormat(L"")
+    , m_timestampFormat(L"")
+    , m_networkManager(ref new NetworkManager())
+    , m_meteredOverrideSet(false)
 {
     if (GlobalizationPreferences::Languages->Size > 0)
     {
@@ -141,11 +134,8 @@ void CurrencyDataLoader::RegisterForNetworkBehaviorChanges()
 {
     UnregisterForNetworkBehaviorChanges();
 
-    m_networkBehaviorToken =
-        m_networkManager->NetworkBehaviorChanged += ref new NetworkBehaviorChangedHandler([this](NetworkAccessBehavior newBehavior)
-    {
-        this->OnNetworkBehaviorChanged(newBehavior);
-    });
+    m_networkBehaviorToken = m_networkManager->NetworkBehaviorChanged +=
+        ref new NetworkBehaviorChangedHandler([this](NetworkAccessBehavior newBehavior) { this->OnNetworkBehaviorChanged(newBehavior); });
 
     OnNetworkBehaviorChanged(NetworkManager::GetNetworkAccessBehavior());
 }
@@ -186,8 +176,7 @@ void CurrencyDataLoader::LoadData()
 
     if (!LoadFinished())
     {
-        create_task([this]() -> task<bool>
-        {
+        create_task([this]() -> task<bool> {
             vector<function<task<bool>()>> loadFunctions = {
                 [this]() { return TryLoadDataFromCacheAsync(); },
                 [this]() { return TryLoadDataFromWebAsync(); },
@@ -204,11 +193,13 @@ void CurrencyDataLoader::LoadData()
             }
 
             co_return didLoad;
-        }).then([this](bool didLoad)
-        {
-            UpdateDisplayedTimestamp();
-            NotifyDataLoadFinished(didLoad);
-        }, task_continuation_context::use_current());
+        })
+            .then(
+                [this](bool didLoad) {
+                    UpdateDisplayedTimestamp();
+                    NotifyDataLoadFinished(didLoad);
+                },
+                task_continuation_context::use_current());
     }
 };
 #pragma optimize("", on)
@@ -284,27 +275,19 @@ pair<wstring, wstring> CurrencyDataLoader::GetCurrencyRatioEquality(_In_ const U
                 wstring digitSymbol = wstring{ LocalizationSettings::GetInstance().GetDigitSymbolFromEnUsDigit(L'1') };
                 wstring roundedFormat = m_ratioFormatter->Format(rounded)->Data();
 
-                wstring ratioString = LocalizationStringUtil::GetLocalizedString(
-                    m_ratioFormat.c_str(),
-                    digitSymbol.c_str(),
-                    unit1.abbreviation.c_str(),
-                    roundedFormat.c_str(),
-                    unit2.abbreviation.c_str()
-                );
+                wstring ratioString = LocalizationStringUtil::GetLocalizedString(m_ratioFormat.c_str(), digitSymbol.c_str(), unit1.abbreviation.c_str(),
+                                                                                 roundedFormat.c_str(), unit2.abbreviation.c_str());
 
                 wstring accessibleRatioString = LocalizationStringUtil::GetLocalizedString(
-                    m_ratioFormat.c_str(),
-                    digitSymbol.c_str(),
-                    unit1.accessibleName.c_str(),
-                    roundedFormat.c_str(),
-                    unit2.accessibleName.c_str()
-                );
+                    m_ratioFormat.c_str(), digitSymbol.c_str(), unit1.accessibleName.c_str(), roundedFormat.c_str(), unit2.accessibleName.c_str());
 
                 return make_pair(ratioString, accessibleRatioString);
             }
         }
     }
-    catch (...) {}
+    catch (...)
+    {
+    }
 
     return make_pair(L"", L"");
 }
@@ -324,8 +307,7 @@ task<bool> CurrencyDataLoader::TryLoadDataFromCacheAsync()
 
         bool loadComplete = false;
         m_cacheTimestamp = static_cast<DateTime>(localSettings->Values->Lookup(CacheTimestampKey));
-        if (Utils::IsDateTimeOlderThan(m_cacheTimestamp, DAY_DURATION)
-            && m_networkAccessBehavior == NetworkAccessBehavior::Normal)
+        if (Utils::IsDateTimeOlderThan(m_cacheTimestamp, DAY_DURATION) && m_networkAccessBehavior == NetworkAccessBehavior::Normal)
         {
             loadComplete = co_await TryLoadDataFromWebAsync();
         }
@@ -337,7 +319,7 @@ task<bool> CurrencyDataLoader::TryLoadDataFromCacheAsync()
 
         co_return loadComplete;
     }
-    catch (Exception^ ex)
+    catch (Exception ^ ex)
     {
         TraceLogger::GetInstance().LogPlatformException(__FUNCTIONW__, ex);
         co_return false;
@@ -361,29 +343,24 @@ task<bool> CurrencyDataLoader::TryFinishLoadFromCacheAsync()
         co_return false;
     }
 
-    if (!localSettings->Values->HasKey(CacheLangcodeKey)
-        || !static_cast<String^>(localSettings->Values->Lookup(CacheLangcodeKey))->Equals(m_responseLanguage))
+    if (!localSettings->Values->HasKey(CacheLangcodeKey) || !static_cast<String ^>(localSettings->Values->Lookup(CacheLangcodeKey))->Equals(m_responseLanguage))
     {
         co_return false;
     }
 
-    StorageFolder^ localCacheFolder = ApplicationData::Current->LocalCacheFolder;
+    StorageFolder ^ localCacheFolder = ApplicationData::Current->LocalCacheFolder;
     if (localCacheFolder == nullptr)
     {
         co_return false;
     }
 
-    String^ staticDataResponse = co_await Utils::ReadFileFromFolder(localCacheFolder, StaticDataFilename);
-    String^ allRatiosResponse = co_await Utils::ReadFileFromFolder(localCacheFolder, AllRatiosDataFilename);
+    String ^ staticDataResponse = co_await Utils::ReadFileFromFolder(localCacheFolder, StaticDataFilename);
+    String ^ allRatiosResponse = co_await Utils::ReadFileFromFolder(localCacheFolder, AllRatiosDataFilename);
 
     vector<UCM::CurrencyStaticData> staticData{};
     CurrencyRatioMap ratioMap{};
 
-    bool didParse = TryParseWebResponses(
-        staticDataResponse,
-        allRatiosResponse,
-        staticData,
-        ratioMap);
+    bool didParse = TryParseWebResponses(staticDataResponse, allRatiosResponse, staticData, ratioMap);
     if (!didParse)
     {
         co_return false;
@@ -406,14 +383,13 @@ task<bool> CurrencyDataLoader::TryLoadDataFromWebAsync()
             co_return false;
         }
 
-        if (m_networkAccessBehavior == NetworkAccessBehavior::Offline ||
-            (m_networkAccessBehavior == NetworkAccessBehavior::OptIn && !m_meteredOverrideSet))
+        if (m_networkAccessBehavior == NetworkAccessBehavior::Offline || (m_networkAccessBehavior == NetworkAccessBehavior::OptIn && !m_meteredOverrideSet))
         {
             co_return false;
         }
 
-        String^ staticDataResponse = co_await m_client->GetCurrencyMetadata();
-        String^ allRatiosResponse = co_await m_client->GetCurrencyRatios();
+        String ^ staticDataResponse = co_await m_client->GetCurrencyMetadata();
+        String ^ allRatiosResponse = co_await m_client->GetCurrencyRatios();
         if (staticDataResponse == nullptr || allRatiosResponse == nullptr)
         {
             co_return false;
@@ -422,11 +398,7 @@ task<bool> CurrencyDataLoader::TryLoadDataFromWebAsync()
         vector<UCM::CurrencyStaticData> staticData{};
         CurrencyRatioMap ratioMap{};
 
-        bool didParse = TryParseWebResponses(
-            staticDataResponse,
-            allRatiosResponse,
-            staticData,
-            ratioMap);
+        bool didParse = TryParseWebResponses(staticDataResponse, allRatiosResponse, staticData, ratioMap);
         if (!didParse)
         {
             co_return false;
@@ -437,19 +409,12 @@ task<bool> CurrencyDataLoader::TryLoadDataFromWebAsync()
 
         try
         {
-            const vector<pair<String^, String^>> cachedFiles = {
-                { StaticDataFilename, staticDataResponse },
-                { AllRatiosDataFilename, allRatiosResponse }
-            };
+            const vector<pair<String ^, String ^>> cachedFiles = { { StaticDataFilename, staticDataResponse }, { AllRatiosDataFilename, allRatiosResponse } };
 
-            StorageFolder^ localCacheFolder = ApplicationData::Current->LocalCacheFolder;
+            StorageFolder ^ localCacheFolder = ApplicationData::Current->LocalCacheFolder;
             for (const auto& fileInfo : cachedFiles)
             {
-                co_await Utils::WriteFileToFolder(
-                    localCacheFolder,
-                    fileInfo.first,
-                    fileInfo.second,
-                    CreationCollisionOption::ReplaceExisting);
+                co_await Utils::WriteFileToFolder(localCacheFolder, fileInfo.first, fileInfo.second, CreationCollisionOption::ReplaceExisting);
             }
 
             SaveLangCodeAndTimestamp();
@@ -464,7 +429,7 @@ task<bool> CurrencyDataLoader::TryLoadDataFromWebAsync()
 
         co_return true;
     }
-    catch (Exception^ ex)
+    catch (Exception ^ ex)
     {
         TraceLogger::GetInstance().LogPlatformException(__FUNCTIONW__, ex);
         co_return false;
@@ -494,19 +459,15 @@ task<bool> CurrencyDataLoader::TryLoadDataFromWebOverrideAsync()
 };
 #pragma optimize("", on)
 
-bool CurrencyDataLoader::TryParseWebResponses(
-    _In_ String^ staticDataJson,
-    _In_ String^ allRatiosJson,
-    _Inout_ vector<UCM::CurrencyStaticData>& staticData,
-    _Inout_ CurrencyRatioMap& allRatiosData)
+bool CurrencyDataLoader::TryParseWebResponses(_In_ String ^ staticDataJson, _In_ String ^ allRatiosJson, _Inout_ vector<UCM::CurrencyStaticData>& staticData,
+                                              _Inout_ CurrencyRatioMap& allRatiosData)
 {
-    return TryParseStaticData(staticDataJson, staticData)
-        && TryParseAllRatiosData(allRatiosJson, allRatiosData);
+    return TryParseStaticData(staticDataJson, staticData) && TryParseAllRatiosData(allRatiosJson, allRatiosData);
 }
 
-bool CurrencyDataLoader::TryParseStaticData(_In_ String^ rawJson, _Inout_ vector<UCM::CurrencyStaticData>& staticData)
+bool CurrencyDataLoader::TryParseStaticData(_In_ String ^ rawJson, _Inout_ vector<UCM::CurrencyStaticData>& staticData)
 {
-    JsonArray^ data = nullptr;
+    JsonArray ^ data = nullptr;
     if (!JsonArray::TryParse(rawJson, &data))
     {
         return false;
@@ -518,46 +479,31 @@ bool CurrencyDataLoader::TryParseStaticData(_In_ String^ rawJson, _Inout_ vector
     wstring currencyName{ L"" };
     wstring currencySymbol{ L"" };
 
-    vector<wstring*> values = {
-        &countryCode,
-        &countryName,
-        &currencyCode,
-        &currencyName,
-        &currencySymbol
-    };
+    vector<wstring*> values = { &countryCode, &countryName, &currencyCode, &currencyName, &currencySymbol };
 
     assert(values.size() == STATIC_DATA_PROPERTIES.size());
     staticData.resize(size_t{ data->Size });
     for (unsigned int i = 0; i < data->Size; i++)
     {
-        JsonObject^ obj = data->GetAt(i)->GetObject();
+        JsonObject ^ obj = data->GetAt(i)->GetObject();
 
         for (size_t j = 0; j < values.size(); j++)
         {
             (*values[j]) = obj->GetNamedString(StringReference(STATIC_DATA_PROPERTIES[j].data()))->Data();
         }
 
-        staticData[i] = CurrencyStaticData{
-            countryCode,
-            countryName,
-            currencyCode,
-            currencyName,
-            currencySymbol
-        };
+        staticData[i] = CurrencyStaticData{ countryCode, countryName, currencyCode, currencyName, currencySymbol };
     }
 
     // TODO - MSFT 8533667: this sort will be replaced by a WinRT call to sort localized strings
-    sort(begin(staticData), end(staticData), [](CurrencyStaticData unit1, CurrencyStaticData unit2)
-    {
-        return unit1.countryName < unit2.countryName;
-    });
+    sort(begin(staticData), end(staticData), [](CurrencyStaticData unit1, CurrencyStaticData unit2) { return unit1.countryName < unit2.countryName; });
 
     return true;
 }
 
-bool CurrencyDataLoader::TryParseAllRatiosData(_In_ String^ rawJson, _Inout_ CurrencyRatioMap& allRatios)
+bool CurrencyDataLoader::TryParseAllRatiosData(_In_ String ^ rawJson, _Inout_ CurrencyRatioMap& allRatios)
 {
-    JsonArray^ data = nullptr;
+    JsonArray ^ data = nullptr;
     if (!JsonArray::TryParse(rawJson, &data))
     {
         return false;
@@ -568,17 +514,13 @@ bool CurrencyDataLoader::TryParseAllRatiosData(_In_ String^ rawJson, _Inout_ Cur
     allRatios.clear();
     for (unsigned int i = 0; i < data->Size; i++)
     {
-        JsonObject^ obj = data->GetAt(i)->GetObject();
+        JsonObject ^ obj = data->GetAt(i)->GetObject();
 
         // Rt is ratio, An is target currency ISO code.
         double relativeRatio = obj->GetNamedNumber(StringReference(RATIO_KEY));
         wstring targetCurrencyCode = obj->GetNamedString(StringReference(CURRENCY_CODE_KEY))->Data();
 
-        allRatios.emplace(targetCurrencyCode, CurrencyRatio{
-            relativeRatio,
-            sourceCurrencyCode,
-            targetCurrencyCode
-        });
+        allRatios.emplace(targetCurrencyCode, CurrencyRatio{ relativeRatio, sourceCurrencyCode, targetCurrencyCode });
     }
 
     return true;
@@ -702,7 +644,7 @@ void CurrencyDataLoader::NotifyDataLoadFinished(bool didLoad)
 
 void CurrencyDataLoader::SaveLangCodeAndTimestamp()
 {
-    ApplicationDataContainer^ localSettings = ApplicationData::Current->LocalSettings;
+    ApplicationDataContainer ^ localSettings = ApplicationData::Current->LocalSettings;
     if (localSettings == nullptr)
     {
         return;
@@ -729,17 +671,13 @@ wstring CurrencyDataLoader::GetCurrencyTimestamp()
     DateTime epoch{};
     if (m_cacheTimestamp.UniversalTime != epoch.UniversalTime)
     {
-        DateTimeFormatter^ dateFormatter = ref new DateTimeFormatter(L"{month.abbreviated} {day.integer}, {year.full}");
+        DateTimeFormatter ^ dateFormatter = ref new DateTimeFormatter(L"{month.abbreviated} {day.integer}, {year.full}");
         wstring date = dateFormatter->Format(m_cacheTimestamp)->Data();
 
-        DateTimeFormatter^ timeFormatter = ref new DateTimeFormatter(L"shorttime");
+        DateTimeFormatter ^ timeFormatter = ref new DateTimeFormatter(L"shorttime");
         wstring time = timeFormatter->Format(m_cacheTimestamp)->Data();
 
-        timestamp = LocalizationStringUtil::GetLocalizedString(
-            m_timestampFormat.c_str(),
-            date.c_str(),
-            time.c_str()
-        );
+        timestamp = LocalizationStringUtil::GetLocalizedString(m_timestampFormat.c_str(), date.c_str(), time.c_str());
     }
 
     return timestamp;
@@ -758,23 +696,25 @@ task<SelectedUnits> CurrencyDataLoader::GetDefaultFromToCurrency()
         try
         {
             // Second, see if the current locale has preset defaults in DefaultFromToCurrency.json.
-            Uri^ fileUri = ref new Uri(StringReference(DEFAULT_FROM_TO_CURRENCY_FILE_URI));
-            StorageFile^ defaultFromToCurrencyFile = co_await StorageFile::GetFileFromApplicationUriAsync(fileUri);
+            Uri ^ fileUri = ref new Uri(StringReference(DEFAULT_FROM_TO_CURRENCY_FILE_URI));
+            StorageFile ^ defaultFromToCurrencyFile = co_await StorageFile::GetFileFromApplicationUriAsync(fileUri);
             if (defaultFromToCurrencyFile != nullptr)
             {
-                String^ fileContents = co_await FileIO::ReadTextAsync(defaultFromToCurrencyFile);
-                JsonObject^ fromToObject = JsonObject::Parse(fileContents);
-                JsonObject^ regionalDefaults = fromToObject->GetNamedObject(m_responseLanguage);
+                String ^ fileContents = co_await FileIO::ReadTextAsync(defaultFromToCurrencyFile);
+                JsonObject ^ fromToObject = JsonObject::Parse(fileContents);
+                JsonObject ^ regionalDefaults = fromToObject->GetNamedObject(m_responseLanguage);
 
                 // Get both values before assignment in-case either fails.
-                String^ selectedFrom = regionalDefaults->GetNamedString(StringReference(FROM_KEY));
-                String^ selectedTo = regionalDefaults->GetNamedString(StringReference(TO_KEY));
+                String ^ selectedFrom = regionalDefaults->GetNamedString(StringReference(FROM_KEY));
+                String ^ selectedTo = regionalDefaults->GetNamedString(StringReference(TO_KEY));
 
                 fromCurrency = selectedFrom->Data();
                 toCurrency = selectedTo->Data();
             }
         }
-        catch (...) {}
+        catch (...)
+        {
+        }
     }
 
     co_return make_pair(fromCurrency, toCurrency);
@@ -783,16 +723,16 @@ task<SelectedUnits> CurrencyDataLoader::GetDefaultFromToCurrency()
 
 bool CurrencyDataLoader::TryGetLastUsedCurrenciesFromLocalSettings(_Out_ wstring* const fromCurrency, _Out_ wstring* const toCurrency)
 {
-    String^ fromKey = UnitConverterResourceKeys::CurrencyUnitFromKey;
-    String^ toKey = UnitConverterResourceKeys::CurrencyUnitToKey;
-    ApplicationDataContainer^ localSettings = ApplicationData::Current->LocalSettings;
+    String ^ fromKey = UnitConverterResourceKeys::CurrencyUnitFromKey;
+    String ^ toKey = UnitConverterResourceKeys::CurrencyUnitToKey;
+    ApplicationDataContainer ^ localSettings = ApplicationData::Current->LocalSettings;
     if (localSettings != nullptr && localSettings->Values != nullptr)
     {
-        IPropertySet^ values = localSettings->Values;
+        IPropertySet ^ values = localSettings->Values;
         if (values->HasKey(fromKey) && values->HasKey(toKey))
         {
-            *fromCurrency = static_cast<String^>(values->Lookup(fromKey))->Data();
-            *toCurrency = static_cast<String^>(values->Lookup(toKey))->Data();
+            *fromCurrency = static_cast<String ^>(values->Lookup(fromKey))->Data();
+            *toCurrency = static_cast<String ^>(values->Lookup(toKey))->Data();
 
             return true;
         }
@@ -803,12 +743,12 @@ bool CurrencyDataLoader::TryGetLastUsedCurrenciesFromLocalSettings(_Out_ wstring
 
 void CurrencyDataLoader::SaveSelectedUnitsToLocalSettings(_In_ const SelectedUnits& selectedUnits)
 {
-    String^ fromKey = UnitConverterResourceKeys::CurrencyUnitFromKey;
-    String^ toKey = UnitConverterResourceKeys::CurrencyUnitToKey;
-    ApplicationDataContainer^ localSettings = ApplicationData::Current->LocalSettings;
+    String ^ fromKey = UnitConverterResourceKeys::CurrencyUnitFromKey;
+    String ^ toKey = UnitConverterResourceKeys::CurrencyUnitToKey;
+    ApplicationDataContainer ^ localSettings = ApplicationData::Current->LocalSettings;
     if (localSettings != nullptr && localSettings->Values != nullptr)
     {
-        IPropertySet^ values = localSettings->Values;
+        IPropertySet ^ values = localSettings->Values;
         values->Insert(fromKey, StringReference(selectedUnits.first.c_str()));
         values->Insert(toKey, StringReference(selectedUnits.second.c_str()));
     }

src/CalcViewModel/DataLoaders/CurrencyDataLoader.h

@@ -11,7 +11,8 @@ namespace CalculatorApp
 {
     namespace ViewModel
     {
-        public enum class CurrencyLoadStatus
+    public
+        enum class CurrencyLoadStatus
         {
             NotLoaded = 0,
             FailedToLoad = 1,
@@ -42,13 +43,14 @@ namespace CalculatorApp
 
         struct CurrencyUnitMetadata
         {
-            CurrencyUnitMetadata(const std::wstring& s) : symbol(s) {}
+            CurrencyUnitMetadata(const std::wstring& s) : symbol(s)
+            {
+            }
 
             const std::wstring symbol;
         };
 
-        class CurrencyDataLoader : public UCM::IConverterDataLoader,
-            public UCM::ICurrencyConverterDataLoader
+        class CurrencyDataLoader : public UCM::IConverterDataLoader, public UCM::ICurrencyConverterDataLoader
         {
         public:
             CurrencyDataLoader(_In_ std::unique_ptr<CalculatorApp::DataLoaders::ICurrencyHttpClient> client);
@@ -69,7 +71,8 @@ namespace CalculatorApp
             // ICurrencyConverterDataLoader
             void SetViewModelCallback(const std::shared_ptr<UCM::IViewModelCurrencyCallback>& callback) override;
             std::pair<std::wstring, std::wstring> GetCurrencySymbols(const UCM::Unit& unit1, const UCM::Unit& unit2) override;
-            std::pair<std::wstring, std::wstring> GetCurrencyRatioEquality(_In_ const UnitConversionManager::Unit& unit1, _In_ const UnitConversionManager::Unit& unit2) override;
+            std::pair<std::wstring, std::wstring> GetCurrencyRatioEquality(_In_ const UnitConversionManager::Unit& unit1,
+                                                                           _In_ const UnitConversionManager::Unit& unit2) override;
             std::wstring GetCurrencyTimestamp() override;
 
             concurrency::task<bool> TryLoadDataFromCacheAsync() override;
@@ -85,13 +88,10 @@ namespace CalculatorApp
 
             concurrency::task<bool> TryFinishLoadFromCacheAsync();
 
-            bool TryParseWebResponses(
-                _In_ Platform::String^ staticDataJson,
-                _In_ Platform::String^ allRatiosJson,
-                _Inout_ std::vector<UCM::CurrencyStaticData>& staticData,
-                _Inout_ CurrencyRatioMap& allRatiosData);
-            bool TryParseStaticData(_In_ Platform::String^ rawJson, _Inout_ std::vector<UCM::CurrencyStaticData>& staticData);
-            bool TryParseAllRatiosData(_In_ Platform::String^ rawJson, _Inout_ CurrencyRatioMap& allRatiosData);
+            bool TryParseWebResponses(_In_ Platform::String ^ staticDataJson, _In_ Platform::String ^ allRatiosJson,
+                                      _Inout_ std::vector<UCM::CurrencyStaticData>& staticData, _Inout_ CurrencyRatioMap& allRatiosData);
+            bool TryParseStaticData(_In_ Platform::String ^ rawJson, _Inout_ std::vector<UCM::CurrencyStaticData>& staticData);
+            bool TryParseAllRatiosData(_In_ Platform::String ^ rawJson, _Inout_ CurrencyRatioMap& allRatiosData);
             concurrency::task<void> FinalizeUnits(_In_ const std::vector<UCM::CurrencyStaticData>& staticData, _In_ const CurrencyRatioMap& ratioMap);
             void GuaranteeSelectedUnits();
 
@@ -106,7 +106,7 @@ namespace CalculatorApp
             void SaveSelectedUnitsToLocalSettings(_In_ const SelectedUnits& selectedUnits);
 
         private:
-            Platform::String^ m_responseLanguage;
+            Platform::String ^ m_responseLanguage;
             std::unique_ptr<CalculatorApp::DataLoaders::ICurrencyHttpClient> m_client;
 
             bool m_isRtlLanguage;
@@ -118,14 +118,14 @@ namespace CalculatorApp
 
             std::shared_ptr<UCM::IViewModelCurrencyCallback> m_vmCallback;
 
-            Windows::Globalization::NumberFormatting::DecimalFormatter^ m_ratioFormatter;
+            Windows::Globalization::NumberFormatting::DecimalFormatter ^ m_ratioFormatter;
             std::wstring m_ratioFormat;
             Windows::Foundation::DateTime m_cacheTimestamp;
             std::wstring m_timestampFormat;
 
             CurrencyLoadStatus m_loadStatus;
 
-            CalculatorApp::NetworkManager^ m_networkManager;
+            CalculatorApp::NetworkManager ^ m_networkManager;
             CalculatorApp::NetworkAccessBehavior m_networkAccessBehavior;
             Windows::Foundation::EventRegistrationToken m_networkBehaviorToken;
             bool m_meteredOverrideSet;

src/CalcViewModel/DataLoaders/CurrencyHttpClient.cpp

@@ -13,23 +13,21 @@ using namespace Windows::Web::Http;
 static constexpr auto sc_MetadataUriLocalizeFor = L"https://go.microsoft.com/fwlink/?linkid=2041093&localizeFor=";
 static constexpr auto sc_RatiosUriRelativeTo = L"https://go.microsoft.com/fwlink/?linkid=2041339&localCurrency=";
 
-CurrencyHttpClient::CurrencyHttpClient() :
-    m_client(ref new HttpClient()),
-    m_responseLanguage(L"en-US")
+CurrencyHttpClient::CurrencyHttpClient() : m_client(ref new HttpClient()), m_responseLanguage(L"en-US")
 {
 }
 
-void CurrencyHttpClient::SetSourceCurrencyCode(String^ sourceCurrencyCode)
+void CurrencyHttpClient::SetSourceCurrencyCode(String ^ sourceCurrencyCode)
 {
     m_sourceCurrencyCode = sourceCurrencyCode;
 }
 
-void CurrencyHttpClient::SetResponseLanguage(String^ responseLanguage)
+void CurrencyHttpClient::SetResponseLanguage(String ^ responseLanguage)
 {
     m_responseLanguage = responseLanguage;
 }
 
-IAsyncOperationWithProgress<String^, HttpProgress>^ CurrencyHttpClient::GetCurrencyMetadata()
+IAsyncOperationWithProgress<String ^, HttpProgress> ^ CurrencyHttpClient::GetCurrencyMetadata()
 {
     wstring uri = wstring{ sc_MetadataUriLocalizeFor } + m_responseLanguage->Data();
     auto metadataUri = ref new Uri(StringReference(uri.c_str()));
@@ -37,7 +35,7 @@ IAsyncOperationWithProgress<String^, HttpProgress>^ CurrencyHttpClient::GetCurre
     return m_client->GetStringAsync(metadataUri);
 }
 
-IAsyncOperationWithProgress<String^, HttpProgress>^ CurrencyHttpClient::GetCurrencyRatios()
+IAsyncOperationWithProgress<String ^, HttpProgress> ^ CurrencyHttpClient::GetCurrencyRatios()
 {
     wstring uri = wstring{ sc_RatiosUriRelativeTo } + m_sourceCurrencyCode->Data();
     auto ratiosUri = ref new Uri(StringReference(uri.c_str()));

src/CalcViewModel/DataLoaders/CurrencyHttpClient.h

@@ -14,16 +14,16 @@ namespace CalculatorApp
         public:
             CurrencyHttpClient();
 
-            void SetSourceCurrencyCode(Platform::String^ sourceCurrencyCode) override;
-            void SetResponseLanguage(Platform::String^ responseLanguage) override;
+            void SetSourceCurrencyCode(Platform::String ^ sourceCurrencyCode) override;
+            void SetResponseLanguage(Platform::String ^ responseLanguage) override;
 
-            Windows::Foundation::IAsyncOperationWithProgress<Platform::String^, Windows::Web::Http::HttpProgress>^ GetCurrencyMetadata() override;
-            Windows::Foundation::IAsyncOperationWithProgress<Platform::String^, Windows::Web::Http::HttpProgress>^ GetCurrencyRatios() override;
+            Windows::Foundation::IAsyncOperationWithProgress<Platform::String ^, Windows::Web::Http::HttpProgress> ^ GetCurrencyMetadata() override;
+            Windows::Foundation::IAsyncOperationWithProgress<Platform::String ^, Windows::Web::Http::HttpProgress> ^ GetCurrencyRatios() override;
 
         private:
-            Windows::Web::Http::HttpClient^ m_client;
-            Platform::String^ m_responseLanguage;
-            Platform::String^ m_sourceCurrencyCode;
+            Windows::Web::Http::HttpClient ^ m_client;
+            Platform::String ^ m_responseLanguage;
+            Platform::String ^ m_sourceCurrencyCode;
         };
     }
 }

src/CalcViewModel/DataLoaders/ICurrencyHttpClient.h

@@ -10,13 +10,15 @@ namespace CalculatorApp
         class ICurrencyHttpClient
         {
         public:
-            virtual ~ICurrencyHttpClient() {}
+            virtual ~ICurrencyHttpClient()
+            {
+            }
 
-            virtual void SetSourceCurrencyCode(Platform::String^ sourceCurrencyCode) = 0;
-            virtual void SetResponseLanguage(Platform::String^ responseLanguage) = 0;
+            virtual void SetSourceCurrencyCode(Platform::String ^ sourceCurrencyCode) = 0;
+            virtual void SetResponseLanguage(Platform::String ^ responseLanguage) = 0;
 
-            virtual Windows::Foundation::IAsyncOperationWithProgress<Platform::String^, Windows::Web::Http::HttpProgress>^ GetCurrencyMetadata() = 0;
-            virtual Windows::Foundation::IAsyncOperationWithProgress<Platform::String^, Windows::Web::Http::HttpProgress>^ GetCurrencyRatios() = 0;
+            virtual Windows::Foundation::IAsyncOperationWithProgress<Platform::String ^, Windows::Web::Http::HttpProgress> ^ GetCurrencyMetadata() = 0;
+            virtual Windows::Foundation::IAsyncOperationWithProgress<Platform::String ^, Windows::Web::Http::HttpProgress> ^ GetCurrencyRatios() = 0;
         };
     }
 }

src/CalcViewModel/DataLoaders/UnitConverterDataConstants.h

@@ -5,7 +5,8 @@ namespace CalculatorApp
 {
     namespace ViewModel
     {
-        private enum UnitConverterUnits
+    private
+        enum UnitConverterUnits
         {
             UnitStart = 0,
             Area_Acre = UnitStart + 1,

src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp

@@ -18,8 +18,7 @@ using namespace Windows::Globalization;
 
 static constexpr bool CONVERT_WITH_OFFSET_FIRST = true;
 
-UnitConverterDataLoader::UnitConverterDataLoader(GeographicRegion^ region) :
-    m_currentRegionCode(region->CodeTwoLetter)
+UnitConverterDataLoader::UnitConverterDataLoader(GeographicRegion ^ region) : m_currentRegionCode(region->CodeTwoLetter)
 {
     m_categoryList = make_shared<vector<UCM::Category>>();
     m_categoryToUnits = make_shared<UCM::CategoryToUnitVectorMap>();
@@ -55,10 +54,7 @@ bool UnitConverterDataLoader::SupportsCategory(const UCM::Category& target)
 
     static int currencyId = NavCategory::Serialize(ViewMode::Currency);
     auto itr = find_if(supportedCategories->begin(), supportedCategories->end(),
-        [&](const UCM::Category& category)
-    {
-        return currencyId != category.id && target.id == category.id;
-    });
+                       [&](const UCM::Category& category) { return currencyId != category.id && target.id == category.id; });
 
     return itr != supportedCategories->end();
 }
@@ -96,7 +92,7 @@ void UnitConverterDataLoader::LoadData()
         vector<UCM::Unit> unitList;
 
         // Sort the units by order
-        sort(orderedUnits.begin(), orderedUnits.end(), [](const OrderedUnit& first, const OrderedUnit& second){ return first.order < second.order; });
+        sort(orderedUnits.begin(), orderedUnits.end(), [](const OrderedUnit& first, const OrderedUnit& second) { return first.order < second.order; });
 
         for (OrderedUnit u : orderedUnits)
         {
@@ -118,7 +114,7 @@ void UnitConverterDataLoader::LoadData()
                 unordered_map<int, double> unitConversions = categoryToUnitConversionDataMap.at(categoryViewMode);
                 double unitFactor = unitConversions[unit.id];
 
-                 for (const auto&[id, conversionFactor] : unitConversions)
+                for (const auto& [id, conversionFactor] : unitConversions)
                 {
                     if (idToUnit.find(id) == idToUnit.end())
                     {
@@ -154,20 +150,15 @@ void UnitConverterDataLoader::GetCategories(_In_ shared_ptr<vector<UCM::Category
     for (auto const& category : converterCategory->Categories)
     {
         /* Id, CategoryName, SupportsNegative */
-        categoriesList->emplace_back(
-            NavCategory::Serialize(category->Mode),
-            category->Name->Data(),
-            category->SupportsNegative);
+        categoriesList->emplace_back(NavCategory::Serialize(category->Mode), category->Name->Data(), category->SupportsNegative);
     }
 }
 
 void UnitConverterDataLoader::GetUnits(_In_ unordered_map<ViewMode, vector<OrderedUnit>>& unitMap)
 {
     // US + Federated States of Micronesia, Marshall Islands, Palau
-    bool useUSCustomaryAndFahrenheit = m_currentRegionCode == L"US" ||
-        m_currentRegionCode == L"FM" ||
-        m_currentRegionCode == L"MH" ||
-        m_currentRegionCode == L"PW";
+    bool useUSCustomaryAndFahrenheit =
+        m_currentRegionCode == L"US" || m_currentRegionCode == L"FM" || m_currentRegionCode == L"MH" || m_currentRegionCode == L"PW";
 
     // useUSCustomaryAndFahrenheit + Liberia
     // Source: https://en.wikipedia.org/wiki/Metrication
@@ -185,369 +176,522 @@ void UnitConverterDataLoader::GetUnits(_In_ unordered_map<ViewMode, vector<Order
     // Use Pyeong, a Korean floorspace unit.
     // https://en.wikipedia.org/wiki/Korean_units_of_measurement#Area
     bool usePyeong = m_currentRegionCode == L"KP" || m_currentRegionCode == L"KR";
-    
+
     vector<OrderedUnit> areaUnits;
-    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_Acre, GetLocalizedStringName(L"UnitName_Acre"), GetLocalizedStringName(L"UnitAbbreviation_Acre"), 9 });
-    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_Hectare, GetLocalizedStringName(L"UnitName_Hectare"), GetLocalizedStringName(L"UnitAbbreviation_Hectare"), 4 });
-    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareCentimeter, GetLocalizedStringName(L"UnitName_SquareCentimeter"), GetLocalizedStringName(L"UnitAbbreviation_SquareCentimeter"), 2 });
-    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareFoot, GetLocalizedStringName(L"UnitName_SquareFoot"), GetLocalizedStringName(L"UnitAbbreviation_SquareFoot"), 7, useSI, useUSCustomary, false });
-    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareInch, GetLocalizedStringName(L"UnitName_SquareInch"), GetLocalizedStringName(L"UnitAbbreviation_SquareInch"), 6 });
-    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareKilometer, GetLocalizedStringName(L"UnitName_SquareKilometer"), GetLocalizedStringName(L"UnitAbbreviation_SquareKilometer"), 5 });
-    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareMeter, GetLocalizedStringName(L"UnitName_SquareMeter"), GetLocalizedStringName(L"UnitAbbreviation_SquareMeter"), 3, useUSCustomary, useSI, false});
-    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareMile, GetLocalizedStringName(L"UnitName_SquareMile"), GetLocalizedStringName(L"UnitAbbreviation_SquareMile"), 10 });
-    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareMillimeter, GetLocalizedStringName(L"UnitName_SquareMillimeter"), GetLocalizedStringName(L"UnitAbbreviation_SquareMillimeter"), 1 });
-    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareYard, GetLocalizedStringName(L"UnitName_SquareYard"), GetLocalizedStringName(L"UnitAbbreviation_SquareYard"), 8 });
-    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_Hand, GetLocalizedStringName(L"UnitName_Hand"), GetLocalizedStringName(L"UnitAbbreviation_Hand"), 11, false, false, true});
-    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_Paper, GetLocalizedStringName(L"UnitName_Paper"), GetLocalizedStringName(L"UnitAbbreviation_Paper"), 12, false, false, true });
-    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SoccerField, GetLocalizedStringName(L"UnitName_SoccerField"), GetLocalizedStringName(L"UnitAbbreviation_SoccerField"),13, false, false, true });
-    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_Castle, GetLocalizedStringName(L"UnitName_Castle"), GetLocalizedStringName(L"UnitAbbreviation_Castle"), 14, false, false, true });
+    areaUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Area_Acre, GetLocalizedStringName(L"UnitName_Acre"), GetLocalizedStringName(L"UnitAbbreviation_Acre"), 9 });
+    areaUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Area_Hectare, GetLocalizedStringName(L"UnitName_Hectare"), GetLocalizedStringName(L"UnitAbbreviation_Hectare"), 4 });
+    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareCentimeter, GetLocalizedStringName(L"UnitName_SquareCentimeter"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_SquareCentimeter"), 2 });
+    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareFoot, GetLocalizedStringName(L"UnitName_SquareFoot"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_SquareFoot"), 7, useSI, useUSCustomary, false });
+    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareInch, GetLocalizedStringName(L"UnitName_SquareInch"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_SquareInch"), 6 });
+    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareKilometer, GetLocalizedStringName(L"UnitName_SquareKilometer"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_SquareKilometer"), 5 });
+    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareMeter, GetLocalizedStringName(L"UnitName_SquareMeter"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_SquareMeter"), 3, useUSCustomary, useSI, false });
+    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareMile, GetLocalizedStringName(L"UnitName_SquareMile"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_SquareMile"), 10 });
+    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareMillimeter, GetLocalizedStringName(L"UnitName_SquareMillimeter"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_SquareMillimeter"), 1 });
+    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SquareYard, GetLocalizedStringName(L"UnitName_SquareYard"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_SquareYard"), 8 });
+    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_Hand, GetLocalizedStringName(L"UnitName_Hand"), GetLocalizedStringName(L"UnitAbbreviation_Hand"),
+                                     11, false, false, true });
+    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_Paper, GetLocalizedStringName(L"UnitName_Paper"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Paper"), 12, false, false, true });
+    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_SoccerField, GetLocalizedStringName(L"UnitName_SoccerField"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_SoccerField"), 13, false, false, true });
+    areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_Castle, GetLocalizedStringName(L"UnitName_Castle"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Castle"), 14, false, false, true });
     if (usePyeong)
     {
-        areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_Pyeong, GetLocalizedStringName(L"UnitName_Pyeong"), GetLocalizedStringName(L"UnitAbbreviation_Pyeong"), 15, false, false, false });
+        areaUnits.push_back(OrderedUnit{ UnitConverterUnits::Area_Pyeong, GetLocalizedStringName(L"UnitName_Pyeong"),
+                                         GetLocalizedStringName(L"UnitAbbreviation_Pyeong"), 15, false, false, false });
     }
     unitMap.emplace(ViewMode::Area, areaUnits);
 
     vector<OrderedUnit> dataUnits;
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Bit, GetLocalizedStringName(L"UnitName_Bit"), GetLocalizedStringName(L"UnitAbbreviation_Bit"), 1 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Byte, GetLocalizedStringName(L"UnitName_Byte"), GetLocalizedStringName(L"UnitAbbreviation_Byte"), 2 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Exabits, GetLocalizedStringName(L"UnitName_Exabits"), GetLocalizedStringName(L"UnitAbbreviation_Exabits"), 23 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Exabytes, GetLocalizedStringName(L"UnitName_Exabytes"), GetLocalizedStringName(L"UnitAbbreviation_Exabytes"), 25 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Exbibits, GetLocalizedStringName(L"UnitName_Exbibits"), GetLocalizedStringName(L"UnitAbbreviation_Exbibits"), 24 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Exbibytes, GetLocalizedStringName(L"UnitName_Exbibytes"), GetLocalizedStringName(L"UnitAbbreviation_Exbibytes"), 26 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Gibibits, GetLocalizedStringName(L"UnitName_Gibibits"), GetLocalizedStringName(L"UnitAbbreviation_Gibibits"), 12 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Gibibytes, GetLocalizedStringName(L"UnitName_Gibibytes"), GetLocalizedStringName(L"UnitAbbreviation_Gibibytes"), 14 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Gigabit, GetLocalizedStringName(L"UnitName_Gigabit"), GetLocalizedStringName(L"UnitAbbreviation_Gigabit"), 11 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Gigabyte, GetLocalizedStringName(L"UnitName_Gigabyte"), GetLocalizedStringName(L"UnitAbbreviation_Gigabyte"),13,  true, false, false});
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Kibibits, GetLocalizedStringName(L"UnitName_Kibibits"), GetLocalizedStringName(L"UnitAbbreviation_Kibibits"), 4 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Kibibytes, GetLocalizedStringName(L"UnitName_Kibibytes"), GetLocalizedStringName(L"UnitAbbreviation_Kibibytes"),6 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Kilobit, GetLocalizedStringName(L"UnitName_Kilobit"), GetLocalizedStringName(L"UnitAbbreviation_Kilobit"), 3 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Kilobyte, GetLocalizedStringName(L"UnitName_Kilobyte"), GetLocalizedStringName(L"UnitAbbreviation_Kilobyte"), 5 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Mebibits, GetLocalizedStringName(L"UnitName_Mebibits"), GetLocalizedStringName(L"UnitAbbreviation_Mebibits"), 8 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Mebibytes, GetLocalizedStringName(L"UnitName_Mebibytes"), GetLocalizedStringName(L"UnitAbbreviation_Mebibytes"), 10 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Megabit, GetLocalizedStringName(L"UnitName_Megabit"), GetLocalizedStringName(L"UnitAbbreviation_Megabit"), 7 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Megabyte, GetLocalizedStringName(L"UnitName_Megabyte"), GetLocalizedStringName(L"UnitAbbreviation_Megabyte"), 9, false, true, false});
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Pebibits, GetLocalizedStringName(L"UnitName_Pebibits"), GetLocalizedStringName(L"UnitAbbreviation_Pebibits"), 20 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Pebibytes, GetLocalizedStringName(L"UnitName_Pebibytes"), GetLocalizedStringName(L"UnitAbbreviation_Pebibytes"), 22 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Petabit, GetLocalizedStringName(L"UnitName_Petabit"), GetLocalizedStringName(L"UnitAbbreviation_Petabit"), 19 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Petabyte, GetLocalizedStringName(L"UnitName_Petabyte"), GetLocalizedStringName(L"UnitAbbreviation_Petabyte"), 21 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Tebibits, GetLocalizedStringName(L"UnitName_Tebibits"), GetLocalizedStringName(L"UnitAbbreviation_Tebibits"), 16 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Tebibytes, GetLocalizedStringName(L"UnitName_Tebibytes"), GetLocalizedStringName(L"UnitAbbreviation_Tebibytes"), 18 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Terabit, GetLocalizedStringName(L"UnitName_Terabit"), GetLocalizedStringName(L"UnitAbbreviation_Terabit"), 15 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Terabyte, GetLocalizedStringName(L"UnitName_Terabyte"), GetLocalizedStringName(L"UnitAbbreviation_Terabyte"), 17 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Yobibits, GetLocalizedStringName(L"UnitName_Yobibits"), GetLocalizedStringName(L"UnitAbbreviation_Yobibits"), 32 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Yobibytes, GetLocalizedStringName(L"UnitName_Yobibytes"), GetLocalizedStringName(L"UnitAbbreviation_Yobibytes"), 34 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Yottabit, GetLocalizedStringName(L"UnitName_Yottabit"), GetLocalizedStringName(L"UnitAbbreviation_Yottabit"), 31 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Yottabyte, GetLocalizedStringName(L"UnitName_Yottabyte"), GetLocalizedStringName(L"UnitAbbreviation_Yottabyte"), 33 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Zebibits, GetLocalizedStringName(L"UnitName_Zebibits"), GetLocalizedStringName(L"UnitAbbreviation_Zebibits"), 28 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Zebibytes, GetLocalizedStringName(L"UnitName_Zebibytes"), GetLocalizedStringName(L"UnitAbbreviation_Zebibytes"), 30 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Zetabits, GetLocalizedStringName(L"UnitName_Zetabits"), GetLocalizedStringName(L"UnitAbbreviation_Zetabits"), 27 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Zetabytes, GetLocalizedStringName(L"UnitName_Zetabytes"), GetLocalizedStringName(L"UnitAbbreviation_Zetabytes"),29 });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_FloppyDisk, GetLocalizedStringName(L"UnitName_FloppyDisk"), GetLocalizedStringName(L"UnitAbbreviation_FloppyDisk"), 13, false, false, true });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_CD, GetLocalizedStringName(L"UnitName_CD"), GetLocalizedStringName(L"UnitAbbreviation_CD"), 14, false, false, true });
-    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_DVD, GetLocalizedStringName(L"UnitName_DVD"), GetLocalizedStringName(L"UnitAbbreviation_DVD"), 15, false, false, true });
+    dataUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Data_Bit, GetLocalizedStringName(L"UnitName_Bit"), GetLocalizedStringName(L"UnitAbbreviation_Bit"), 1 });
+    dataUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Data_Byte, GetLocalizedStringName(L"UnitName_Byte"), GetLocalizedStringName(L"UnitAbbreviation_Byte"), 2 });
+    dataUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Data_Exabits, GetLocalizedStringName(L"UnitName_Exabits"), GetLocalizedStringName(L"UnitAbbreviation_Exabits"), 23 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Exabytes, GetLocalizedStringName(L"UnitName_Exabytes"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Exabytes"), 25 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Exbibits, GetLocalizedStringName(L"UnitName_Exbibits"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Exbibits"), 24 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Exbibytes, GetLocalizedStringName(L"UnitName_Exbibytes"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Exbibytes"), 26 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Gibibits, GetLocalizedStringName(L"UnitName_Gibibits"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Gibibits"), 12 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Gibibytes, GetLocalizedStringName(L"UnitName_Gibibytes"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Gibibytes"), 14 });
+    dataUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Data_Gigabit, GetLocalizedStringName(L"UnitName_Gigabit"), GetLocalizedStringName(L"UnitAbbreviation_Gigabit"), 11 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Gigabyte, GetLocalizedStringName(L"UnitName_Gigabyte"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Gigabyte"), 13, true, false, false });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Kibibits, GetLocalizedStringName(L"UnitName_Kibibits"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Kibibits"), 4 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Kibibytes, GetLocalizedStringName(L"UnitName_Kibibytes"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Kibibytes"), 6 });
+    dataUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Data_Kilobit, GetLocalizedStringName(L"UnitName_Kilobit"), GetLocalizedStringName(L"UnitAbbreviation_Kilobit"), 3 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Kilobyte, GetLocalizedStringName(L"UnitName_Kilobyte"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Kilobyte"), 5 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Mebibits, GetLocalizedStringName(L"UnitName_Mebibits"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Mebibits"), 8 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Mebibytes, GetLocalizedStringName(L"UnitName_Mebibytes"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Mebibytes"), 10 });
+    dataUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Data_Megabit, GetLocalizedStringName(L"UnitName_Megabit"), GetLocalizedStringName(L"UnitAbbreviation_Megabit"), 7 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Megabyte, GetLocalizedStringName(L"UnitName_Megabyte"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Megabyte"), 9, false, true, false });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Pebibits, GetLocalizedStringName(L"UnitName_Pebibits"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Pebibits"), 20 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Pebibytes, GetLocalizedStringName(L"UnitName_Pebibytes"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Pebibytes"), 22 });
+    dataUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Data_Petabit, GetLocalizedStringName(L"UnitName_Petabit"), GetLocalizedStringName(L"UnitAbbreviation_Petabit"), 19 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Petabyte, GetLocalizedStringName(L"UnitName_Petabyte"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Petabyte"), 21 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Tebibits, GetLocalizedStringName(L"UnitName_Tebibits"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Tebibits"), 16 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Tebibytes, GetLocalizedStringName(L"UnitName_Tebibytes"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Tebibytes"), 18 });
+    dataUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Data_Terabit, GetLocalizedStringName(L"UnitName_Terabit"), GetLocalizedStringName(L"UnitAbbreviation_Terabit"), 15 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Terabyte, GetLocalizedStringName(L"UnitName_Terabyte"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Terabyte"), 17 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Yobibits, GetLocalizedStringName(L"UnitName_Yobibits"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Yobibits"), 32 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Yobibytes, GetLocalizedStringName(L"UnitName_Yobibytes"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Yobibytes"), 34 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Yottabit, GetLocalizedStringName(L"UnitName_Yottabit"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Yottabit"), 31 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Yottabyte, GetLocalizedStringName(L"UnitName_Yottabyte"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Yottabyte"), 33 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Zebibits, GetLocalizedStringName(L"UnitName_Zebibits"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Zebibits"), 28 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Zebibytes, GetLocalizedStringName(L"UnitName_Zebibytes"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Zebibytes"), 30 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Zetabits, GetLocalizedStringName(L"UnitName_Zetabits"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Zetabits"), 27 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_Zetabytes, GetLocalizedStringName(L"UnitName_Zetabytes"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Zetabytes"), 29 });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_FloppyDisk, GetLocalizedStringName(L"UnitName_FloppyDisk"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_FloppyDisk"), 13, false, false, true });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_CD, GetLocalizedStringName(L"UnitName_CD"), GetLocalizedStringName(L"UnitAbbreviation_CD"), 14,
+                                     false, false, true });
+    dataUnits.push_back(OrderedUnit{ UnitConverterUnits::Data_DVD, GetLocalizedStringName(L"UnitName_DVD"), GetLocalizedStringName(L"UnitAbbreviation_DVD"), 15,
+                                     false, false, true });
     unitMap.emplace(ViewMode::Data, dataUnits);
 
     vector<OrderedUnit> energyUnits;
-    energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_BritishThermalUnit, GetLocalizedStringName(L"UnitName_BritishThermalUnit"), GetLocalizedStringName(L"UnitAbbreviation_BritishThermalUnit"), 7 });
-    energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_Calorie, GetLocalizedStringName(L"UnitName_Calorie"), GetLocalizedStringName(L"UnitAbbreviation_Calorie"), 4 });
-    energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_ElectronVolt, GetLocalizedStringName(L"UnitName_Electron-Volt"), GetLocalizedStringName(L"UnitAbbreviation_Electron-Volt"), 1 });
-    energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_FootPound, GetLocalizedStringName(L"UnitName_Foot-Pound"), GetLocalizedStringName(L"UnitAbbreviation_Foot-Pound"), 6 });
-    energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_Joule, GetLocalizedStringName(L"UnitName_Joule"), GetLocalizedStringName(L"UnitAbbreviation_Joule"), 2, true, false, false});
-    energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_Kilocalorie, GetLocalizedStringName(L"UnitName_Kilocalorie"), GetLocalizedStringName(L"UnitAbbreviation_Kilocalorie"), 5, false, true, false });
-    energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_Kilojoule, GetLocalizedStringName(L"UnitName_Kilojoule"), GetLocalizedStringName(L"UnitAbbreviation_Kilojoule"), 3 });
-    energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_Battery, GetLocalizedStringName(L"UnitName_Battery"), GetLocalizedStringName(L"UnitAbbreviation_Battery"), 8, false, false, true });
-    energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_Banana, GetLocalizedStringName(L"UnitName_Banana"), GetLocalizedStringName(L"UnitAbbreviation_Banana"), 9, false, false, true });
-    energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_SliceOfCake, GetLocalizedStringName(L"UnitName_SliceOfCake"), GetLocalizedStringName(L"UnitAbbreviation_SliceOfCake"),10,  false, false, true });
+    energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_BritishThermalUnit, GetLocalizedStringName(L"UnitName_BritishThermalUnit"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_BritishThermalUnit"), 7 });
+    energyUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Energy_Calorie, GetLocalizedStringName(L"UnitName_Calorie"), GetLocalizedStringName(L"UnitAbbreviation_Calorie"), 4 });
+    energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_ElectronVolt, GetLocalizedStringName(L"UnitName_Electron-Volt"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Electron-Volt"), 1 });
+    energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_FootPound, GetLocalizedStringName(L"UnitName_Foot-Pound"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Foot-Pound"), 6 });
+    energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_Joule, GetLocalizedStringName(L"UnitName_Joule"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Joule"), 2, true, false, false });
+    energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_Kilocalorie, GetLocalizedStringName(L"UnitName_Kilocalorie"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Kilocalorie"), 5, false, true, false });
+    energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_Kilojoule, GetLocalizedStringName(L"UnitName_Kilojoule"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Kilojoule"), 3 });
+    energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_Battery, GetLocalizedStringName(L"UnitName_Battery"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Battery"), 8, false, false, true });
+    energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_Banana, GetLocalizedStringName(L"UnitName_Banana"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Banana"), 9, false, false, true });
+    energyUnits.push_back(OrderedUnit{ UnitConverterUnits::Energy_SliceOfCake, GetLocalizedStringName(L"UnitName_SliceOfCake"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_SliceOfCake"), 10, false, false, true });
     unitMap.emplace(ViewMode::Energy, energyUnits);
 
     vector<OrderedUnit> lengthUnits;
-    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Centimeter, GetLocalizedStringName(L"UnitName_Centimeter"), GetLocalizedStringName(L"UnitAbbreviation_Centimeter"), 4, useUSCustomary, useSI, false});
-    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Foot, GetLocalizedStringName(L"UnitName_Foot"), GetLocalizedStringName(L"UnitAbbreviation_Foot"), 8 });
-    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Inch, GetLocalizedStringName(L"UnitName_Inch"), GetLocalizedStringName(L"UnitAbbreviation_Inch"), 7 , useSI, useUSCustomary, false });
-    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Kilometer, GetLocalizedStringName(L"UnitName_Kilometer"), GetLocalizedStringName(L"UnitAbbreviation_Kilometer"), 6 });
-    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Meter, GetLocalizedStringName(L"UnitName_Meter"), GetLocalizedStringName(L"UnitAbbreviation_Meter"), 5 });
-    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Micron, GetLocalizedStringName(L"UnitName_Micron"), GetLocalizedStringName(L"UnitAbbreviation_Micron"), 2 });
-    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Mile, GetLocalizedStringName(L"UnitName_Mile"), GetLocalizedStringName(L"UnitAbbreviation_Mile"), 10 });
-    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Millimeter, GetLocalizedStringName(L"UnitName_Millimeter"), GetLocalizedStringName(L"UnitAbbreviation_Millimeter"), 3 });
-    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Nanometer, GetLocalizedStringName(L"UnitName_Nanometer"), GetLocalizedStringName(L"UnitAbbreviation_Nanometer"), 1 });
-    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_NauticalMile, GetLocalizedStringName(L"UnitName_NauticalMile"), GetLocalizedStringName(L"UnitAbbreviation_NauticalMile"), 11 });
-    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Yard, GetLocalizedStringName(L"UnitName_Yard"), GetLocalizedStringName(L"UnitAbbreviation_Yard"), 9 });
-    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Paperclip, GetLocalizedStringName(L"UnitName_Paperclip"), GetLocalizedStringName(L"UnitAbbreviation_Paperclip"), 12 ,false, false, true });
-    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Hand, GetLocalizedStringName(L"UnitName_Hand"), GetLocalizedStringName(L"UnitAbbreviation_Hand"), 13 ,false, false, true });
-    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_JumboJet, GetLocalizedStringName(L"UnitName_JumboJet"), GetLocalizedStringName(L"UnitAbbreviation_JumboJet"), 14 , false, false, true });
+    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Centimeter, GetLocalizedStringName(L"UnitName_Centimeter"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Centimeter"), 4, useUSCustomary, useSI, false });
+    lengthUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Length_Foot, GetLocalizedStringName(L"UnitName_Foot"), GetLocalizedStringName(L"UnitAbbreviation_Foot"), 8 });
+    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Inch, GetLocalizedStringName(L"UnitName_Inch"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Inch"), 7, useSI, useUSCustomary, false });
+    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Kilometer, GetLocalizedStringName(L"UnitName_Kilometer"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Kilometer"), 6 });
+    lengthUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Length_Meter, GetLocalizedStringName(L"UnitName_Meter"), GetLocalizedStringName(L"UnitAbbreviation_Meter"), 5 });
+    lengthUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Length_Micron, GetLocalizedStringName(L"UnitName_Micron"), GetLocalizedStringName(L"UnitAbbreviation_Micron"), 2 });
+    lengthUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Length_Mile, GetLocalizedStringName(L"UnitName_Mile"), GetLocalizedStringName(L"UnitAbbreviation_Mile"), 10 });
+    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Millimeter, GetLocalizedStringName(L"UnitName_Millimeter"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Millimeter"), 3 });
+    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Nanometer, GetLocalizedStringName(L"UnitName_Nanometer"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Nanometer"), 1 });
+    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_NauticalMile, GetLocalizedStringName(L"UnitName_NauticalMile"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_NauticalMile"), 11 });
+    lengthUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Length_Yard, GetLocalizedStringName(L"UnitName_Yard"), GetLocalizedStringName(L"UnitAbbreviation_Yard"), 9 });
+    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Paperclip, GetLocalizedStringName(L"UnitName_Paperclip"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Paperclip"), 12, false, false, true });
+    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_Hand, GetLocalizedStringName(L"UnitName_Hand"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Hand"), 13, false, false, true });
+    lengthUnits.push_back(OrderedUnit{ UnitConverterUnits::Length_JumboJet, GetLocalizedStringName(L"UnitName_JumboJet"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_JumboJet"), 14, false, false, true });
     unitMap.emplace(ViewMode::Length, lengthUnits);
 
     vector<OrderedUnit> powerUnits;
-    powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_BritishThermalUnitPerMinute, GetLocalizedStringName(L"UnitName_BTUPerMinute"), GetLocalizedStringName(L"UnitAbbreviation_BTUPerMinute"), 5 });
-    powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_FootPoundPerMinute, GetLocalizedStringName(L"UnitName_Foot-PoundPerMinute"), GetLocalizedStringName(L"UnitAbbreviation_Foot-PoundPerMinute"), 4 });
-    powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_Horsepower, GetLocalizedStringName(L"UnitName_Horsepower"), GetLocalizedStringName(L"UnitAbbreviation_Horsepower") , 3 , false, true, false });
-    powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_Kilowatt, GetLocalizedStringName(L"UnitName_Kilowatt"), GetLocalizedStringName(L"UnitAbbreviation_Kilowatt"), 2 , !useWattInsteadOfKilowatt});
-    powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_Watt, GetLocalizedStringName(L"UnitName_Watt"), GetLocalizedStringName(L"UnitAbbreviation_Watt"), 1, useWattInsteadOfKilowatt});
-    powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_LightBulb, GetLocalizedStringName(L"UnitName_LightBulb"), GetLocalizedStringName(L"UnitAbbreviation_LightBulb"), 6 ,false, false, true});
-    powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_Horse, GetLocalizedStringName(L"UnitName_Horse"), GetLocalizedStringName(L"UnitAbbreviation_Horse"), 7 ,false, false, true});
-    powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_TrainEngine, GetLocalizedStringName(L"UnitName_TrainEngine"), GetLocalizedStringName(L"UnitAbbreviation_TrainEngine"), 8 ,false, false, true });
+    powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_BritishThermalUnitPerMinute, GetLocalizedStringName(L"UnitName_BTUPerMinute"),
+                                      GetLocalizedStringName(L"UnitAbbreviation_BTUPerMinute"), 5 });
+    powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_FootPoundPerMinute, GetLocalizedStringName(L"UnitName_Foot-PoundPerMinute"),
+                                      GetLocalizedStringName(L"UnitAbbreviation_Foot-PoundPerMinute"), 4 });
+    powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_Horsepower, GetLocalizedStringName(L"UnitName_Horsepower"),
+                                      GetLocalizedStringName(L"UnitAbbreviation_Horsepower"), 3, false, true, false });
+    powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_Kilowatt, GetLocalizedStringName(L"UnitName_Kilowatt"),
+                                      GetLocalizedStringName(L"UnitAbbreviation_Kilowatt"), 2, !useWattInsteadOfKilowatt });
+    powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_Watt, GetLocalizedStringName(L"UnitName_Watt"),
+                                      GetLocalizedStringName(L"UnitAbbreviation_Watt"), 1, useWattInsteadOfKilowatt });
+    powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_LightBulb, GetLocalizedStringName(L"UnitName_LightBulb"),
+                                      GetLocalizedStringName(L"UnitAbbreviation_LightBulb"), 6, false, false, true });
+    powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_Horse, GetLocalizedStringName(L"UnitName_Horse"),
+                                      GetLocalizedStringName(L"UnitAbbreviation_Horse"), 7, false, false, true });
+    powerUnits.push_back(OrderedUnit{ UnitConverterUnits::Power_TrainEngine, GetLocalizedStringName(L"UnitName_TrainEngine"),
+                                      GetLocalizedStringName(L"UnitAbbreviation_TrainEngine"), 8, false, false, true });
     unitMap.emplace(ViewMode::Power, powerUnits);
 
     vector<OrderedUnit> tempUnits;
-    tempUnits.push_back(OrderedUnit{ UnitConverterUnits::Temperature_DegreesCelsius, GetLocalizedStringName(L"UnitName_DegreesCelsius"), GetLocalizedStringName(L"UnitAbbreviation_DegreesCelsius"), 1, useFahrenheit, !useFahrenheit, false });
-    tempUnits.push_back(OrderedUnit{ UnitConverterUnits::Temperature_DegreesFahrenheit, GetLocalizedStringName(L"UnitName_DegreesFahrenheit"), GetLocalizedStringName(L"UnitAbbreviation_DegreesFahrenheit"), 2 , !useFahrenheit, useFahrenheit, false });
-    tempUnits.push_back(OrderedUnit{ UnitConverterUnits::Temperature_Kelvin, GetLocalizedStringName(L"UnitName_Kelvin"), GetLocalizedStringName(L"UnitAbbreviation_Kelvin"), 3 });
+    tempUnits.push_back(OrderedUnit{ UnitConverterUnits::Temperature_DegreesCelsius, GetLocalizedStringName(L"UnitName_DegreesCelsius"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_DegreesCelsius"), 1, useFahrenheit, !useFahrenheit, false });
+    tempUnits.push_back(OrderedUnit{ UnitConverterUnits::Temperature_DegreesFahrenheit, GetLocalizedStringName(L"UnitName_DegreesFahrenheit"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_DegreesFahrenheit"), 2, !useFahrenheit, useFahrenheit, false });
+    tempUnits.push_back(OrderedUnit{ UnitConverterUnits::Temperature_Kelvin, GetLocalizedStringName(L"UnitName_Kelvin"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Kelvin"), 3 });
     unitMap.emplace(ViewMode::Temperature, tempUnits);
 
     vector<OrderedUnit> timeUnits;
-    timeUnits.push_back(OrderedUnit{ UnitConverterUnits::Time_Day, GetLocalizedStringName(L"UnitName_Day"), GetLocalizedStringName(L"UnitAbbreviation_Day"), 6 });
-    timeUnits.push_back(OrderedUnit{ UnitConverterUnits::Time_Hour, GetLocalizedStringName(L"UnitName_Hour"), GetLocalizedStringName(L"UnitAbbreviation_Hour"), 5 ,true, false, false });
-    timeUnits.push_back(OrderedUnit{ UnitConverterUnits::Time_Microsecond, GetLocalizedStringName(L"UnitName_Microsecond"), GetLocalizedStringName(L"UnitAbbreviation_Microsecond"), 1 });
-    timeUnits.push_back(OrderedUnit{ UnitConverterUnits::Time_Millisecond, GetLocalizedStringName(L"UnitName_Millisecond"), GetLocalizedStringName(L"UnitAbbreviation_Millisecond"), 2 });
-    timeUnits.push_back(OrderedUnit{ UnitConverterUnits::Time_Minute, GetLocalizedStringName(L"UnitName_Minute"), GetLocalizedStringName(L"UnitAbbreviation_Minute"), 4 ,false, true, false });
-    timeUnits.push_back(OrderedUnit{ UnitConverterUnits::Time_Second, GetLocalizedStringName(L"UnitName_Second"), GetLocalizedStringName(L"UnitAbbreviation_Second"), 3 });
-    timeUnits.push_back(OrderedUnit{ UnitConverterUnits::Time_Week, GetLocalizedStringName(L"UnitName_Week"), GetLocalizedStringName(L"UnitAbbreviation_Week"), 7 });
-    timeUnits.push_back(OrderedUnit{ UnitConverterUnits::Time_Year, GetLocalizedStringName(L"UnitName_Year"), GetLocalizedStringName(L"UnitAbbreviation_Year"), 8 });
+    timeUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Time_Day, GetLocalizedStringName(L"UnitName_Day"), GetLocalizedStringName(L"UnitAbbreviation_Day"), 6 });
+    timeUnits.push_back(OrderedUnit{ UnitConverterUnits::Time_Hour, GetLocalizedStringName(L"UnitName_Hour"), GetLocalizedStringName(L"UnitAbbreviation_Hour"),
+                                     5, true, false, false });
+    timeUnits.push_back(OrderedUnit{ UnitConverterUnits::Time_Microsecond, GetLocalizedStringName(L"UnitName_Microsecond"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Microsecond"), 1 });
+    timeUnits.push_back(OrderedUnit{ UnitConverterUnits::Time_Millisecond, GetLocalizedStringName(L"UnitName_Millisecond"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Millisecond"), 2 });
+    timeUnits.push_back(OrderedUnit{ UnitConverterUnits::Time_Minute, GetLocalizedStringName(L"UnitName_Minute"),
+                                     GetLocalizedStringName(L"UnitAbbreviation_Minute"), 4, false, true, false });
+    timeUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Time_Second, GetLocalizedStringName(L"UnitName_Second"), GetLocalizedStringName(L"UnitAbbreviation_Second"), 3 });
+    timeUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Time_Week, GetLocalizedStringName(L"UnitName_Week"), GetLocalizedStringName(L"UnitAbbreviation_Week"), 7 });
+    timeUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Time_Year, GetLocalizedStringName(L"UnitName_Year"), GetLocalizedStringName(L"UnitAbbreviation_Year"), 8 });
     unitMap.emplace(ViewMode::Time, timeUnits);
 
     vector<OrderedUnit> speedUnits;
-    speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_CentimetersPerSecond, GetLocalizedStringName(L"UnitName_CentimetersPerSecond"), GetLocalizedStringName(L"UnitAbbreviation_CentimetersPerSecond"), 1 });
-    speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_FeetPerSecond, GetLocalizedStringName(L"UnitName_FeetPerSecond"), GetLocalizedStringName(L"UnitAbbreviation_FeetPerSecond"), 4 });
-    speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_KilometersPerHour, GetLocalizedStringName(L"UnitName_KilometersPerHour"), GetLocalizedStringName(L"UnitAbbreviation_KilometersPerHour"), 3 , useUSCustomary, useSI, false });
-    speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_Knot, GetLocalizedStringName(L"UnitName_Knot"), GetLocalizedStringName(L"UnitAbbreviation_Knot"), 6 });
-    speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_Mach, GetLocalizedStringName(L"UnitName_Mach"), GetLocalizedStringName(L"UnitAbbreviation_Mach"), 7 });
-    speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_MetersPerSecond, GetLocalizedStringName(L"UnitName_MetersPerSecond"), GetLocalizedStringName(L"UnitAbbreviation_MetersPerSecond"), 2 });
-    speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_MilesPerHour, GetLocalizedStringName(L"UnitName_MilesPerHour"), GetLocalizedStringName(L"UnitAbbreviation_MilesPerHour"), 5, useSI, useUSCustomary, false });
-    speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_Turtle, GetLocalizedStringName(L"UnitName_Turtle"), GetLocalizedStringName(L"UnitAbbreviation_Turtle"), 8 ,false, false, true });
-    speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_Horse, GetLocalizedStringName(L"UnitName_Horse"), GetLocalizedStringName(L"UnitAbbreviation_Horse"),9 , false, false, true });
-    speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_Jet, GetLocalizedStringName(L"UnitName_Jet"), GetLocalizedStringName(L"UnitAbbreviation_Jet"), 10, false, false, true });
+    speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_CentimetersPerSecond, GetLocalizedStringName(L"UnitName_CentimetersPerSecond"),
+                                      GetLocalizedStringName(L"UnitAbbreviation_CentimetersPerSecond"), 1 });
+    speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_FeetPerSecond, GetLocalizedStringName(L"UnitName_FeetPerSecond"),
+                                      GetLocalizedStringName(L"UnitAbbreviation_FeetPerSecond"), 4 });
+    speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_KilometersPerHour, GetLocalizedStringName(L"UnitName_KilometersPerHour"),
+                                      GetLocalizedStringName(L"UnitAbbreviation_KilometersPerHour"), 3, useUSCustomary, useSI, false });
+    speedUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Speed_Knot, GetLocalizedStringName(L"UnitName_Knot"), GetLocalizedStringName(L"UnitAbbreviation_Knot"), 6 });
+    speedUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Speed_Mach, GetLocalizedStringName(L"UnitName_Mach"), GetLocalizedStringName(L"UnitAbbreviation_Mach"), 7 });
+    speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_MetersPerSecond, GetLocalizedStringName(L"UnitName_MetersPerSecond"),
+                                      GetLocalizedStringName(L"UnitAbbreviation_MetersPerSecond"), 2 });
+    speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_MilesPerHour, GetLocalizedStringName(L"UnitName_MilesPerHour"),
+                                      GetLocalizedStringName(L"UnitAbbreviation_MilesPerHour"), 5, useSI, useUSCustomary, false });
+    speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_Turtle, GetLocalizedStringName(L"UnitName_Turtle"),
+                                      GetLocalizedStringName(L"UnitAbbreviation_Turtle"), 8, false, false, true });
+    speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_Horse, GetLocalizedStringName(L"UnitName_Horse"),
+                                      GetLocalizedStringName(L"UnitAbbreviation_Horse"), 9, false, false, true });
+    speedUnits.push_back(OrderedUnit{ UnitConverterUnits::Speed_Jet, GetLocalizedStringName(L"UnitName_Jet"), GetLocalizedStringName(L"UnitAbbreviation_Jet"),
+                                      10, false, false, true });
     unitMap.emplace(ViewMode::Speed, speedUnits);
 
     vector<OrderedUnit> volumeUnits;
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_CubicCentimeter, GetLocalizedStringName(L"UnitName_CubicCentimeter"), GetLocalizedStringName(L"UnitAbbreviation_CubicCentimeter"), 2 });
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_CubicFoot, GetLocalizedStringName(L"UnitName_CubicFoot"), GetLocalizedStringName(L"UnitAbbreviation_CubicFoot"), 13 });
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_CubicInch, GetLocalizedStringName(L"UnitName_CubicInch"), GetLocalizedStringName(L"UnitAbbreviation_CubicInch"),  12 });
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_CubicMeter, GetLocalizedStringName(L"UnitName_CubicMeter"), GetLocalizedStringName(L"UnitAbbreviation_CubicMeter"), 4 });
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_CubicYard, GetLocalizedStringName(L"UnitName_CubicYard"), GetLocalizedStringName(L"UnitAbbreviation_CubicYard"), 14 });
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_CupUS, GetLocalizedStringName(L"UnitName_CupUS"), GetLocalizedStringName(L"UnitAbbreviation_CupUS"), 8 });
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_FluidOunceUK, GetLocalizedStringName(L"UnitName_FluidOunceUK"), GetLocalizedStringName(L"UnitAbbreviation_FluidOunceUK"), 17 });
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_FluidOunceUS, GetLocalizedStringName(L"UnitName_FluidOunceUS"), GetLocalizedStringName(L"UnitAbbreviation_FluidOunceUS"), 7 });
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_GallonUK, GetLocalizedStringName(L"UnitName_GallonUK"), GetLocalizedStringName(L"UnitAbbreviation_GallonUK"), 20 });
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_GallonUS, GetLocalizedStringName(L"UnitName_GallonUS"), GetLocalizedStringName(L"UnitAbbreviation_GallonUS"), 11 });
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_Liter, GetLocalizedStringName(L"UnitName_Liter"), GetLocalizedStringName(L"UnitAbbreviation_Liter"), 3 });
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_Milliliter, GetLocalizedStringName(L"UnitName_Milliliter"), GetLocalizedStringName(L"UnitAbbreviation_Milliliter"), 1, useUSCustomary, useSI});
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_PintUK, GetLocalizedStringName(L"UnitName_PintUK"), GetLocalizedStringName(L"UnitAbbreviation_PintUK"), 18 });
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_PintUS, GetLocalizedStringName(L"UnitName_PintUS"), GetLocalizedStringName(L"UnitAbbreviation_PintUS"), 9 });
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_TablespoonUS, GetLocalizedStringName(L"UnitName_TablespoonUS"), GetLocalizedStringName(L"UnitAbbreviation_TablespoonUS"), 6 });
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_TeaspoonUS, GetLocalizedStringName(L"UnitName_TeaspoonUS"), GetLocalizedStringName(L"UnitAbbreviation_TeaspoonUS"), 5, useSI, useUSCustomary && m_currentRegionCode != "GB" });
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_QuartUK, GetLocalizedStringName(L"UnitName_QuartUK"), GetLocalizedStringName(L"UnitAbbreviation_QuartUK"), 19 });
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_QuartUS, GetLocalizedStringName(L"UnitName_QuartUS"), GetLocalizedStringName(L"UnitAbbreviation_QuartUS"), 10 });
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_TeaspoonUK, GetLocalizedStringName(L"UnitName_TeaspoonUK"), GetLocalizedStringName(L"UnitAbbreviation_TeaspoonUK"), 15, false, useUSCustomary && m_currentRegionCode == "GB"});
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_TablespoonUK, GetLocalizedStringName(L"UnitName_TablespoonUK"), GetLocalizedStringName(L"UnitAbbreviation_TablespoonUK"), 16 });
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_CoffeeCup, GetLocalizedStringName(L"UnitName_CoffeeCup"), GetLocalizedStringName(L"UnitAbbreviation_CoffeeCup"), 22 ,false, false, true });
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_Bathtub, GetLocalizedStringName(L"UnitName_Bathtub"), GetLocalizedStringName(L"UnitAbbreviation_Bathtub"), 23 ,false, false, true});
-    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_SwimmingPool, GetLocalizedStringName(L"UnitName_SwimmingPool"), GetLocalizedStringName(L"UnitAbbreviation_SwimmingPool"), 24 ,false, false, true });
+    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_CubicCentimeter, GetLocalizedStringName(L"UnitName_CubicCentimeter"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_CubicCentimeter"), 2 });
+    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_CubicFoot, GetLocalizedStringName(L"UnitName_CubicFoot"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_CubicFoot"), 13 });
+    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_CubicInch, GetLocalizedStringName(L"UnitName_CubicInch"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_CubicInch"), 12 });
+    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_CubicMeter, GetLocalizedStringName(L"UnitName_CubicMeter"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_CubicMeter"), 4 });
+    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_CubicYard, GetLocalizedStringName(L"UnitName_CubicYard"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_CubicYard"), 14 });
+    volumeUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Volume_CupUS, GetLocalizedStringName(L"UnitName_CupUS"), GetLocalizedStringName(L"UnitAbbreviation_CupUS"), 8 });
+    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_FluidOunceUK, GetLocalizedStringName(L"UnitName_FluidOunceUK"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_FluidOunceUK"), 17 });
+    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_FluidOunceUS, GetLocalizedStringName(L"UnitName_FluidOunceUS"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_FluidOunceUS"), 7 });
+    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_GallonUK, GetLocalizedStringName(L"UnitName_GallonUK"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_GallonUK"), 20 });
+    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_GallonUS, GetLocalizedStringName(L"UnitName_GallonUS"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_GallonUS"), 11 });
+    volumeUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Volume_Liter, GetLocalizedStringName(L"UnitName_Liter"), GetLocalizedStringName(L"UnitAbbreviation_Liter"), 3 });
+    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_Milliliter, GetLocalizedStringName(L"UnitName_Milliliter"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Milliliter"), 1, useUSCustomary, useSI });
+    volumeUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Volume_PintUK, GetLocalizedStringName(L"UnitName_PintUK"), GetLocalizedStringName(L"UnitAbbreviation_PintUK"), 18 });
+    volumeUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Volume_PintUS, GetLocalizedStringName(L"UnitName_PintUS"), GetLocalizedStringName(L"UnitAbbreviation_PintUS"), 9 });
+    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_TablespoonUS, GetLocalizedStringName(L"UnitName_TablespoonUS"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_TablespoonUS"), 6 });
+    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_TeaspoonUS, GetLocalizedStringName(L"UnitName_TeaspoonUS"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_TeaspoonUS"), 5, useSI, useUSCustomary && m_currentRegionCode != "GB" });
+    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_QuartUK, GetLocalizedStringName(L"UnitName_QuartUK"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_QuartUK"), 19 });
+    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_QuartUS, GetLocalizedStringName(L"UnitName_QuartUS"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_QuartUS"), 10 });
+    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_TeaspoonUK, GetLocalizedStringName(L"UnitName_TeaspoonUK"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_TeaspoonUK"), 15, false, useUSCustomary && m_currentRegionCode == "GB" });
+    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_TablespoonUK, GetLocalizedStringName(L"UnitName_TablespoonUK"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_TablespoonUK"), 16 });
+    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_CoffeeCup, GetLocalizedStringName(L"UnitName_CoffeeCup"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_CoffeeCup"), 22, false, false, true });
+    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_Bathtub, GetLocalizedStringName(L"UnitName_Bathtub"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Bathtub"), 23, false, false, true });
+    volumeUnits.push_back(OrderedUnit{ UnitConverterUnits::Volume_SwimmingPool, GetLocalizedStringName(L"UnitName_SwimmingPool"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_SwimmingPool"), 24, false, false, true });
     unitMap.emplace(ViewMode::Volume, volumeUnits);
 
     vector<OrderedUnit> weightUnits;
-    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Carat, GetLocalizedStringName(L"UnitName_Carat"), GetLocalizedStringName(L"UnitAbbreviation_Carat"), 1 });
-    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Centigram, GetLocalizedStringName(L"UnitName_Centigram"), GetLocalizedStringName(L"UnitAbbreviation_Centigram"), 3 });
-    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Decigram, GetLocalizedStringName(L"UnitName_Decigram"), GetLocalizedStringName(L"UnitAbbreviation_Decigram"), 4 });
-    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Decagram, GetLocalizedStringName(L"UnitName_Decagram"), GetLocalizedStringName(L"UnitAbbreviation_Decagram"), 6 });
-    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Gram, GetLocalizedStringName(L"UnitName_Gram"), GetLocalizedStringName(L"UnitAbbreviation_Gram"), 5 });
-    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Hectogram, GetLocalizedStringName(L"UnitName_Hectogram"), GetLocalizedStringName(L"UnitAbbreviation_Hectogram"), 7 });
-    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Kilogram, GetLocalizedStringName(L"UnitName_Kilogram"), GetLocalizedStringName(L"UnitAbbreviation_Kilogram"), 8 , useUSCustomary, useSI});
-    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_LongTon, GetLocalizedStringName(L"UnitName_LongTon"), GetLocalizedStringName(L"UnitAbbreviation_LongTon"), 14 });
-    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Milligram, GetLocalizedStringName(L"UnitName_Milligram"), GetLocalizedStringName(L"UnitAbbreviation_Milligram"), 2 });
-    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Ounce, GetLocalizedStringName(L"UnitName_Ounce"), GetLocalizedStringName(L"UnitAbbreviation_Ounce"), 10 });
-    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Pound, GetLocalizedStringName(L"UnitName_Pound"), GetLocalizedStringName(L"UnitAbbreviation_Pound"), 11 , useSI, useUSCustomary });
-    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_ShortTon, GetLocalizedStringName(L"UnitName_ShortTon"), GetLocalizedStringName(L"UnitAbbreviation_ShortTon"), 13 });
-    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Stone, GetLocalizedStringName(L"UnitName_Stone"), GetLocalizedStringName(L"UnitAbbreviation_Stone"), 12 });
-    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Tonne, GetLocalizedStringName(L"UnitName_Tonne"), GetLocalizedStringName(L"UnitAbbreviation_Tonne"), 9 });
-    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Snowflake, GetLocalizedStringName(L"UnitName_Snowflake"), GetLocalizedStringName(L"UnitAbbreviation_Snowflake"), 15 ,false, false, true });
-    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_SoccerBall, GetLocalizedStringName(L"UnitName_SoccerBall"), GetLocalizedStringName(L"UnitAbbreviation_SoccerBall"), 16 , false, false, true });
-    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Elephant, GetLocalizedStringName(L"UnitName_Elephant"), GetLocalizedStringName(L"UnitAbbreviation_Elephant"), 17 ,false, false, true });
-    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Whale, GetLocalizedStringName(L"UnitName_Whale"), GetLocalizedStringName(L"UnitAbbreviation_Whale"), 18 ,false, false, true });
+    weightUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Weight_Carat, GetLocalizedStringName(L"UnitName_Carat"), GetLocalizedStringName(L"UnitAbbreviation_Carat"), 1 });
+    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Centigram, GetLocalizedStringName(L"UnitName_Centigram"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Centigram"), 3 });
+    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Decigram, GetLocalizedStringName(L"UnitName_Decigram"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Decigram"), 4 });
+    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Decagram, GetLocalizedStringName(L"UnitName_Decagram"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Decagram"), 6 });
+    weightUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Weight_Gram, GetLocalizedStringName(L"UnitName_Gram"), GetLocalizedStringName(L"UnitAbbreviation_Gram"), 5 });
+    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Hectogram, GetLocalizedStringName(L"UnitName_Hectogram"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Hectogram"), 7 });
+    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Kilogram, GetLocalizedStringName(L"UnitName_Kilogram"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Kilogram"), 8, useUSCustomary, useSI });
+    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_LongTon, GetLocalizedStringName(L"UnitName_LongTon"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_LongTon"), 14 });
+    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Milligram, GetLocalizedStringName(L"UnitName_Milligram"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Milligram"), 2 });
+    weightUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Weight_Ounce, GetLocalizedStringName(L"UnitName_Ounce"), GetLocalizedStringName(L"UnitAbbreviation_Ounce"), 10 });
+    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Pound, GetLocalizedStringName(L"UnitName_Pound"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Pound"), 11, useSI, useUSCustomary });
+    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_ShortTon, GetLocalizedStringName(L"UnitName_ShortTon"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_ShortTon"), 13 });
+    weightUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Weight_Stone, GetLocalizedStringName(L"UnitName_Stone"), GetLocalizedStringName(L"UnitAbbreviation_Stone"), 12 });
+    weightUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Weight_Tonne, GetLocalizedStringName(L"UnitName_Tonne"), GetLocalizedStringName(L"UnitAbbreviation_Tonne"), 9 });
+    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Snowflake, GetLocalizedStringName(L"UnitName_Snowflake"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Snowflake"), 15, false, false, true });
+    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_SoccerBall, GetLocalizedStringName(L"UnitName_SoccerBall"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_SoccerBall"), 16, false, false, true });
+    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Elephant, GetLocalizedStringName(L"UnitName_Elephant"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Elephant"), 17, false, false, true });
+    weightUnits.push_back(OrderedUnit{ UnitConverterUnits::Weight_Whale, GetLocalizedStringName(L"UnitName_Whale"),
+                                       GetLocalizedStringName(L"UnitAbbreviation_Whale"), 18, false, false, true });
     unitMap.emplace(ViewMode::Weight, weightUnits);
 
     vector<OrderedUnit> pressureUnits;
-    pressureUnits.push_back(OrderedUnit{ UnitConverterUnits::Pressure_Atmosphere, GetLocalizedStringName(L"UnitName_Atmosphere"), GetLocalizedStringName(L"UnitAbbreviation_Atmosphere"), 1 , true, false, false });
-    pressureUnits.push_back(OrderedUnit{ UnitConverterUnits::Pressure_Bar, GetLocalizedStringName(L"UnitName_Bar"), GetLocalizedStringName(L"UnitAbbreviation_Bar"), 2, false, true, false});
-    pressureUnits.push_back(OrderedUnit{ UnitConverterUnits::Pressure_KiloPascal, GetLocalizedStringName(L"UnitName_KiloPascal"), GetLocalizedStringName(L"UnitAbbreviation_KiloPascal"), 3 });
-    pressureUnits.push_back(OrderedUnit{ UnitConverterUnits::Pressure_MillimeterOfMercury, GetLocalizedStringName(L"UnitName_MillimeterOfMercury "), GetLocalizedStringName(L"UnitAbbreviation_MillimeterOfMercury "), 4 });
-    pressureUnits.push_back(OrderedUnit{ UnitConverterUnits::Pressure_Pascal, GetLocalizedStringName(L"UnitName_Pascal"), GetLocalizedStringName(L"UnitAbbreviation_Pascal"), 5 });
-    pressureUnits.push_back(OrderedUnit{ UnitConverterUnits::Pressure_PSI, GetLocalizedStringName(L"UnitName_PSI"), GetLocalizedStringName(L"UnitAbbreviation_PSI"), 6, false, false, false });
+    pressureUnits.push_back(OrderedUnit{ UnitConverterUnits::Pressure_Atmosphere, GetLocalizedStringName(L"UnitName_Atmosphere"),
+                                         GetLocalizedStringName(L"UnitAbbreviation_Atmosphere"), 1, true, false, false });
+    pressureUnits.push_back(OrderedUnit{ UnitConverterUnits::Pressure_Bar, GetLocalizedStringName(L"UnitName_Bar"),
+                                         GetLocalizedStringName(L"UnitAbbreviation_Bar"), 2, false, true, false });
+    pressureUnits.push_back(OrderedUnit{ UnitConverterUnits::Pressure_KiloPascal, GetLocalizedStringName(L"UnitName_KiloPascal"),
+                                         GetLocalizedStringName(L"UnitAbbreviation_KiloPascal"), 3 });
+    pressureUnits.push_back(OrderedUnit{ UnitConverterUnits::Pressure_MillimeterOfMercury, GetLocalizedStringName(L"UnitName_MillimeterOfMercury "),
+                                         GetLocalizedStringName(L"UnitAbbreviation_MillimeterOfMercury "), 4 });
+    pressureUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Pressure_Pascal, GetLocalizedStringName(L"UnitName_Pascal"), GetLocalizedStringName(L"UnitAbbreviation_Pascal"), 5 });
+    pressureUnits.push_back(OrderedUnit{ UnitConverterUnits::Pressure_PSI, GetLocalizedStringName(L"UnitName_PSI"),
+                                         GetLocalizedStringName(L"UnitAbbreviation_PSI"), 6, false, false, false });
     unitMap.emplace(ViewMode::Pressure, pressureUnits);
 
     vector<OrderedUnit> angleUnits;
-    angleUnits.push_back(OrderedUnit{ UnitConverterUnits::Angle_Degree, GetLocalizedStringName(L"UnitName_Degree"), GetLocalizedStringName(L"UnitAbbreviation_Degree"), 1, true, false, false });
-    angleUnits.push_back(OrderedUnit{ UnitConverterUnits::Angle_Radian, GetLocalizedStringName(L"UnitName_Radian"), GetLocalizedStringName(L"UnitAbbreviation_Radian"), 2, false, true, false });
-    angleUnits.push_back(OrderedUnit{ UnitConverterUnits::Angle_Gradian, GetLocalizedStringName(L"UnitName_Gradian"), GetLocalizedStringName(L"UnitAbbreviation_Gradian"), 3});
+    angleUnits.push_back(OrderedUnit{ UnitConverterUnits::Angle_Degree, GetLocalizedStringName(L"UnitName_Degree"),
+                                      GetLocalizedStringName(L"UnitAbbreviation_Degree"), 1, true, false, false });
+    angleUnits.push_back(OrderedUnit{ UnitConverterUnits::Angle_Radian, GetLocalizedStringName(L"UnitName_Radian"),
+                                      GetLocalizedStringName(L"UnitAbbreviation_Radian"), 2, false, true, false });
+    angleUnits.push_back(
+        OrderedUnit{ UnitConverterUnits::Angle_Gradian, GetLocalizedStringName(L"UnitName_Gradian"), GetLocalizedStringName(L"UnitAbbreviation_Gradian"), 3 });
     unitMap.emplace(ViewMode::Angle, angleUnits);
 }
 
 void UnitConverterDataLoader::GetConversionData(_In_ unordered_map<ViewMode, unordered_map<int, double>>& categoryToUnitConversionMap)
 {
     /*categoryId, UnitId, factor*/
-    static const vector<UnitData> unitDataList = {
-            { ViewMode::Area, UnitConverterUnits::Area_Acre, 4046.8564224 },
-            { ViewMode::Area, UnitConverterUnits::Area_SquareMeter, 1 },
-            { ViewMode::Area, UnitConverterUnits::Area_SquareFoot, 0.09290304 },
-            { ViewMode::Area, UnitConverterUnits::Area_SquareYard, 0.83612736 },
-            { ViewMode::Area, UnitConverterUnits::Area_SquareMillimeter, 0.000001 },
-            { ViewMode::Area, UnitConverterUnits::Area_SquareCentimeter, 0.0001 },
-            { ViewMode::Area, UnitConverterUnits::Area_SquareInch, 0.00064516 },
-            { ViewMode::Area, UnitConverterUnits::Area_SquareMile, 2589988.110336 },
-            { ViewMode::Area, UnitConverterUnits::Area_SquareKilometer, 1000000 },
-            { ViewMode::Area, UnitConverterUnits::Area_Hectare, 10000 },
-            { ViewMode::Area, UnitConverterUnits::Area_Hand, 0.012516104 },
-            { ViewMode::Area, UnitConverterUnits::Area_Paper, 0.06032246 },
-            { ViewMode::Area, UnitConverterUnits::Area_SoccerField, 10869.66 },
-            { ViewMode::Area, UnitConverterUnits::Area_Castle, 100000 },
-            { ViewMode::Area, UnitConverterUnits::Area_Pyeong, 400.0 / 121.0 },
+    static const vector<UnitData> unitDataList = { { ViewMode::Area, UnitConverterUnits::Area_Acre, 4046.8564224 },
+                                                   { ViewMode::Area, UnitConverterUnits::Area_SquareMeter, 1 },
+                                                   { ViewMode::Area, UnitConverterUnits::Area_SquareFoot, 0.09290304 },
+                                                   { ViewMode::Area, UnitConverterUnits::Area_SquareYard, 0.83612736 },
+                                                   { ViewMode::Area, UnitConverterUnits::Area_SquareMillimeter, 0.000001 },
+                                                   { ViewMode::Area, UnitConverterUnits::Area_SquareCentimeter, 0.0001 },
+                                                   { ViewMode::Area, UnitConverterUnits::Area_SquareInch, 0.00064516 },
+                                                   { ViewMode::Area, UnitConverterUnits::Area_SquareMile, 2589988.110336 },
+                                                   { ViewMode::Area, UnitConverterUnits::Area_SquareKilometer, 1000000 },
+                                                   { ViewMode::Area, UnitConverterUnits::Area_Hectare, 10000 },
+                                                   { ViewMode::Area, UnitConverterUnits::Area_Hand, 0.012516104 },
+                                                   { ViewMode::Area, UnitConverterUnits::Area_Paper, 0.06032246 },
+                                                   { ViewMode::Area, UnitConverterUnits::Area_SoccerField, 10869.66 },
+                                                   { ViewMode::Area, UnitConverterUnits::Area_Castle, 100000 },
+                                                   { ViewMode::Area, UnitConverterUnits::Area_Pyeong, 400.0 / 121.0 },
 
-            { ViewMode::Data, UnitConverterUnits::Data_Bit, 0.000000125 },
-            { ViewMode::Data, UnitConverterUnits::Data_Byte, 0.000001 },
-            { ViewMode::Data, UnitConverterUnits::Data_Kilobyte, 0.001 },
-            { ViewMode::Data, UnitConverterUnits::Data_Megabyte, 1 },
-            { ViewMode::Data, UnitConverterUnits::Data_Gigabyte, 1000 },
-            { ViewMode::Data, UnitConverterUnits::Data_Terabyte, 1000000 },
-            { ViewMode::Data, UnitConverterUnits::Data_Petabyte, 1000000000 },
-            { ViewMode::Data, UnitConverterUnits::Data_Exabytes, 1000000000000 },
-            { ViewMode::Data, UnitConverterUnits::Data_Zetabytes, 1000000000000000 },
-            { ViewMode::Data, UnitConverterUnits::Data_Yottabyte, 1000000000000000000 },
-            { ViewMode::Data, UnitConverterUnits::Data_Kilobit, 0.000125 },
-            { ViewMode::Data, UnitConverterUnits::Data_Megabit, 0.125 },
-            { ViewMode::Data, UnitConverterUnits::Data_Gigabit, 125 },
-            { ViewMode::Data, UnitConverterUnits::Data_Terabit, 125000 },
-            { ViewMode::Data, UnitConverterUnits::Data_Petabit, 125000000 },
-            { ViewMode::Data, UnitConverterUnits::Data_Exabits, 125000000000 },
-            { ViewMode::Data, UnitConverterUnits::Data_Zetabits, 125000000000000 },
-            { ViewMode::Data, UnitConverterUnits::Data_Yottabit, 125000000000000000 },
-            { ViewMode::Data, UnitConverterUnits::Data_Gibibits, 134.217728 },
-            { ViewMode::Data, UnitConverterUnits::Data_Gibibytes, 1073.741824 },
-            { ViewMode::Data, UnitConverterUnits::Data_Kibibits, 0.000128 },
-            { ViewMode::Data, UnitConverterUnits::Data_Kibibytes, 0.001024 },
-            { ViewMode::Data, UnitConverterUnits::Data_Mebibits, 0.131072 },
-            { ViewMode::Data, UnitConverterUnits::Data_Mebibytes, 1.048576 },
-            { ViewMode::Data, UnitConverterUnits::Data_Pebibits, 140737488.355328 },
-            { ViewMode::Data, UnitConverterUnits::Data_Pebibytes, 1125899906.842624 },
-            { ViewMode::Data, UnitConverterUnits::Data_Tebibits, 137438.953472 },
-            { ViewMode::Data, UnitConverterUnits::Data_Tebibytes, 1099511.627776 },
-            { ViewMode::Data, UnitConverterUnits::Data_Exbibits, 144115188075.855872 },
-            { ViewMode::Data, UnitConverterUnits::Data_Exbibytes, 1152921504606.846976 },
-            { ViewMode::Data, UnitConverterUnits::Data_Zebibits, 147573952589676.412928 },
-            { ViewMode::Data, UnitConverterUnits::Data_Zebibytes, 1180591620717411.303424 },
-            { ViewMode::Data, UnitConverterUnits::Data_Yobibits, 151115727451828646.838272 },
-            { ViewMode::Data, UnitConverterUnits::Data_Yobibytes, 1208925819614629174.706176 },
-            { ViewMode::Data, UnitConverterUnits::Data_FloppyDisk, 1.509949 },
-            { ViewMode::Data, UnitConverterUnits::Data_CD, 734.003200 },
-            { ViewMode::Data, UnitConverterUnits::Data_DVD, 5046.586573 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Bit, 0.000000125 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Byte, 0.000001 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Kilobyte, 0.001 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Megabyte, 1 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Gigabyte, 1000 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Terabyte, 1000000 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Petabyte, 1000000000 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Exabytes, 1000000000000 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Zetabytes, 1000000000000000 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Yottabyte, 1000000000000000000 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Kilobit, 0.000125 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Megabit, 0.125 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Gigabit, 125 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Terabit, 125000 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Petabit, 125000000 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Exabits, 125000000000 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Zetabits, 125000000000000 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Yottabit, 125000000000000000 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Gibibits, 134.217728 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Gibibytes, 1073.741824 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Kibibits, 0.000128 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Kibibytes, 0.001024 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Mebibits, 0.131072 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Mebibytes, 1.048576 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Pebibits, 140737488.355328 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Pebibytes, 1125899906.842624 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Tebibits, 137438.953472 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Tebibytes, 1099511.627776 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Exbibits, 144115188075.855872 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Exbibytes, 1152921504606.846976 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Zebibits, 147573952589676.412928 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Zebibytes, 1180591620717411.303424 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Yobibits, 151115727451828646.838272 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_Yobibytes, 1208925819614629174.706176 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_FloppyDisk, 1.509949 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_CD, 734.003200 },
+                                                   { ViewMode::Data, UnitConverterUnits::Data_DVD, 5046.586573 },
 
-            { ViewMode::Energy, UnitConverterUnits::Energy_Calorie, 4.184 },
-            { ViewMode::Energy, UnitConverterUnits::Energy_Kilocalorie, 4184},
-            { ViewMode::Energy, UnitConverterUnits::Energy_BritishThermalUnit, 1055.056 },
-            { ViewMode::Energy, UnitConverterUnits::Energy_Kilojoule, 1000 },
-            { ViewMode::Energy, UnitConverterUnits::Energy_ElectronVolt, 0.0000000000000000001602176565 },
-            { ViewMode::Energy, UnitConverterUnits::Energy_Joule, 1 },
-            { ViewMode::Energy, UnitConverterUnits::Energy_FootPound, 1.3558179483314 },
-            { ViewMode::Energy, UnitConverterUnits::Energy_Battery, 9000 },
-            { ViewMode::Energy, UnitConverterUnits::Energy_Banana, 439614 },
-            { ViewMode::Energy, UnitConverterUnits::Energy_SliceOfCake, 1046700 },
+                                                   { ViewMode::Energy, UnitConverterUnits::Energy_Calorie, 4.184 },
+                                                   { ViewMode::Energy, UnitConverterUnits::Energy_Kilocalorie, 4184 },
+                                                   { ViewMode::Energy, UnitConverterUnits::Energy_BritishThermalUnit, 1055.056 },
+                                                   { ViewMode::Energy, UnitConverterUnits::Energy_Kilojoule, 1000 },
+                                                   { ViewMode::Energy, UnitConverterUnits::Energy_ElectronVolt, 0.0000000000000000001602176565 },
+                                                   { ViewMode::Energy, UnitConverterUnits::Energy_Joule, 1 },
+                                                   { ViewMode::Energy, UnitConverterUnits::Energy_FootPound, 1.3558179483314 },
+                                                   { ViewMode::Energy, UnitConverterUnits::Energy_Battery, 9000 },
+                                                   { ViewMode::Energy, UnitConverterUnits::Energy_Banana, 439614 },
+                                                   { ViewMode::Energy, UnitConverterUnits::Energy_SliceOfCake, 1046700 },
 
-            { ViewMode::Length, UnitConverterUnits::Length_Inch, 0.0254 },
-            { ViewMode::Length, UnitConverterUnits::Length_Foot, 0.3048 },
-            { ViewMode::Length, UnitConverterUnits::Length_Yard, 0.9144 },
-            { ViewMode::Length, UnitConverterUnits::Length_Mile, 1609.344 },
-            { ViewMode::Length, UnitConverterUnits::Length_Micron, 0.000001 },
-            { ViewMode::Length, UnitConverterUnits::Length_Millimeter, 0.001 },
-            { ViewMode::Length, UnitConverterUnits::Length_Nanometer, 0.000000001 },
-            { ViewMode::Length, UnitConverterUnits::Length_Centimeter, 0.01 },
-            { ViewMode::Length, UnitConverterUnits::Length_Meter, 1 },
-            { ViewMode::Length, UnitConverterUnits::Length_Kilometer, 1000 },
-            { ViewMode::Length, UnitConverterUnits::Length_NauticalMile, 1852 },
-            { ViewMode::Length, UnitConverterUnits::Length_Paperclip, 0.035052 },
-            { ViewMode::Length, UnitConverterUnits::Length_Hand, 0.18669 },
-            { ViewMode::Length, UnitConverterUnits::Length_JumboJet, 76 },
+                                                   { ViewMode::Length, UnitConverterUnits::Length_Inch, 0.0254 },
+                                                   { ViewMode::Length, UnitConverterUnits::Length_Foot, 0.3048 },
+                                                   { ViewMode::Length, UnitConverterUnits::Length_Yard, 0.9144 },
+                                                   { ViewMode::Length, UnitConverterUnits::Length_Mile, 1609.344 },
+                                                   { ViewMode::Length, UnitConverterUnits::Length_Micron, 0.000001 },
+                                                   { ViewMode::Length, UnitConverterUnits::Length_Millimeter, 0.001 },
+                                                   { ViewMode::Length, UnitConverterUnits::Length_Nanometer, 0.000000001 },
+                                                   { ViewMode::Length, UnitConverterUnits::Length_Centimeter, 0.01 },
+                                                   { ViewMode::Length, UnitConverterUnits::Length_Meter, 1 },
+                                                   { ViewMode::Length, UnitConverterUnits::Length_Kilometer, 1000 },
+                                                   { ViewMode::Length, UnitConverterUnits::Length_NauticalMile, 1852 },
+                                                   { ViewMode::Length, UnitConverterUnits::Length_Paperclip, 0.035052 },
+                                                   { ViewMode::Length, UnitConverterUnits::Length_Hand, 0.18669 },
+                                                   { ViewMode::Length, UnitConverterUnits::Length_JumboJet, 76 },
 
-            { ViewMode::Power, UnitConverterUnits::Power_BritishThermalUnitPerMinute, 17.58426666666667 },
-            { ViewMode::Power, UnitConverterUnits::Power_FootPoundPerMinute, 0.0225969658055233 },
-            { ViewMode::Power, UnitConverterUnits::Power_Watt, 1 },
-            { ViewMode::Power, UnitConverterUnits::Power_Kilowatt, 1000 },
-            { ViewMode::Power, UnitConverterUnits::Power_Horsepower, 745.69987158227022 },
-            { ViewMode::Power, UnitConverterUnits::Power_LightBulb, 60 },
-            { ViewMode::Power, UnitConverterUnits::Power_Horse, 745.7 },
-            { ViewMode::Power, UnitConverterUnits::Power_TrainEngine, 2982799.486329081 },
+                                                   { ViewMode::Power, UnitConverterUnits::Power_BritishThermalUnitPerMinute, 17.58426666666667 },
+                                                   { ViewMode::Power, UnitConverterUnits::Power_FootPoundPerMinute, 0.0225969658055233 },
+                                                   { ViewMode::Power, UnitConverterUnits::Power_Watt, 1 },
+                                                   { ViewMode::Power, UnitConverterUnits::Power_Kilowatt, 1000 },
+                                                   { ViewMode::Power, UnitConverterUnits::Power_Horsepower, 745.69987158227022 },
+                                                   { ViewMode::Power, UnitConverterUnits::Power_LightBulb, 60 },
+                                                   { ViewMode::Power, UnitConverterUnits::Power_Horse, 745.7 },
+                                                   { ViewMode::Power, UnitConverterUnits::Power_TrainEngine, 2982799.486329081 },
 
-            { ViewMode::Time, UnitConverterUnits::Time_Day, 86400 },
-            { ViewMode::Time, UnitConverterUnits::Time_Second, 1 },
-            { ViewMode::Time, UnitConverterUnits::Time_Week, 604800 },
-            { ViewMode::Time, UnitConverterUnits::Time_Year, 31557600 },
-            { ViewMode::Time, UnitConverterUnits::Time_Millisecond, 0.001 },
-            { ViewMode::Time, UnitConverterUnits::Time_Microsecond, 0.000001 },
-            { ViewMode::Time, UnitConverterUnits::Time_Minute, 60 },
-            { ViewMode::Time, UnitConverterUnits::Time_Hour, 3600 },
+                                                   { ViewMode::Time, UnitConverterUnits::Time_Day, 86400 },
+                                                   { ViewMode::Time, UnitConverterUnits::Time_Second, 1 },
+                                                   { ViewMode::Time, UnitConverterUnits::Time_Week, 604800 },
+                                                   { ViewMode::Time, UnitConverterUnits::Time_Year, 31557600 },
+                                                   { ViewMode::Time, UnitConverterUnits::Time_Millisecond, 0.001 },
+                                                   { ViewMode::Time, UnitConverterUnits::Time_Microsecond, 0.000001 },
+                                                   { ViewMode::Time, UnitConverterUnits::Time_Minute, 60 },
+                                                   { ViewMode::Time, UnitConverterUnits::Time_Hour, 3600 },
 
-            { ViewMode::Volume, UnitConverterUnits::Volume_CupUS, 236.588237 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_PintUS, 473.176473 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_PintUK, 568.26125 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_QuartUS, 946.352946 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_QuartUK, 1136.5225 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_GallonUS, 3785.411784 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_GallonUK, 4546.09 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_Liter, 1000 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_TeaspoonUS, 4.92892159375 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_TablespoonUS, 14.78676478125 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_CubicCentimeter, 1 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_CubicYard, 764554.857984 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_CubicMeter, 1000000 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_Milliliter, 1 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_CubicInch, 16.387064 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_CubicFoot, 28316.846592 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_FluidOunceUS, 29.5735295625 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_FluidOunceUK, 28.4130625 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_TeaspoonUK, 5.91938802083333333333 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_TablespoonUK, 17.7581640625 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_CoffeeCup, 236.5882 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_Bathtub, 378541.2 },
-            { ViewMode::Volume, UnitConverterUnits::Volume_SwimmingPool, 3750000000 },
+                                                   { ViewMode::Volume, UnitConverterUnits::Volume_CupUS, 236.588237 },
+                                                   { ViewMode::Volume, UnitConverterUnits::Volume_PintUS, 473.176473 },
+                                                   { ViewMode::Volume, UnitConverterUnits::Volume_PintUK, 568.26125 },
+                                                   { ViewMode::Volume, UnitConverterUnits::Volume_QuartUS, 946.352946 },
+                                                   { ViewMode::Volume, UnitConverterUnits::Volume_QuartUK, 1136.5225 },
+                                                   { ViewMode::Volume, UnitConverterUnits::Volume_GallonUS, 3785.411784 },
+                                                   { ViewMode::Volume, UnitConverterUnits::Volume_GallonUK, 4546.09 },
+                                                   { ViewMode::Volume, UnitConverterUnits::Volume_Liter, 1000 },
+                                                   { ViewMode::Volume, UnitConverterUnits::Volume_TeaspoonUS, 4.92892159375 },
+                                                   { ViewMode::Volume, UnitConverterUnits::Volume_TablespoonUS, 14.78676478125 },
+                                                   { ViewMode::Volume, UnitConverterUnits::Volume_CubicCentimeter, 1 },
+                                                   { ViewMode::Volume, UnitConverterUnits::Volume_CubicYard, 764554.857984 },
+                                                   { ViewMode::Volume, UnitConverterUnits::Volume_CubicMeter, 1000000 },
+                                                   { ViewMode::Volume, UnitConverterUnits::Volume_Milliliter, 1 },
+                                                   { ViewMode::Volume, UnitConverterUnits::Volume_CubicInch, 16.387064 },
+                                                   { ViewMode::Volume, UnitConverterUnits::Volume_CubicFoot, 28316.846592 },
+                                                   { ViewMode::Volume, UnitConverterUnits::Volume_FluidOunceUS, 29.5735295625 },
+                                                   { ViewMode::Volume, UnitConverterUnits::Volume_FluidOunceUK, 28.4130625 },
+                                                   { ViewMode::Volume, UnitConverterUnits::Volume_TeaspoonUK, 5.91938802083333333333 },
+                                                   { ViewMode::Volume, UnitConverterUnits::Volume_TablespoonUK, 17.7581640625 },
+                                                   { ViewMode::Volume, UnitConverterUnits::Volume_CoffeeCup, 236.5882 },
+                                                   { ViewMode::Volume, UnitConverterUnits::Volume_Bathtub, 378541.2 },
+                                                   { ViewMode::Volume, UnitConverterUnits::Volume_SwimmingPool, 3750000000 },
 
-            { ViewMode::Weight, UnitConverterUnits::Weight_Kilogram, 1 },
-            { ViewMode::Weight, UnitConverterUnits::Weight_Hectogram, 0.1 },
-            { ViewMode::Weight, UnitConverterUnits::Weight_Decagram, 0.01 },
-            { ViewMode::Weight, UnitConverterUnits::Weight_Gram, 0.001 },
-            { ViewMode::Weight, UnitConverterUnits::Weight_Pound, 0.45359237 },
-            { ViewMode::Weight, UnitConverterUnits::Weight_Ounce, 0.028349523125 },
-            { ViewMode::Weight, UnitConverterUnits::Weight_Milligram, 0.000001 },
-            { ViewMode::Weight, UnitConverterUnits::Weight_Centigram, 0.00001 },
-            { ViewMode::Weight, UnitConverterUnits::Weight_Decigram, 0.0001 },
-            { ViewMode::Weight, UnitConverterUnits::Weight_LongTon, 1016.0469088 },
-            { ViewMode::Weight, UnitConverterUnits::Weight_Tonne, 1000 },
-            { ViewMode::Weight, UnitConverterUnits::Weight_Stone, 6.35029318 },
-            { ViewMode::Weight, UnitConverterUnits::Weight_Carat, 0.0002 },
-            { ViewMode::Weight, UnitConverterUnits::Weight_ShortTon, 907.18474 },
-            { ViewMode::Weight, UnitConverterUnits::Weight_Snowflake, 0.000002 },
-            { ViewMode::Weight, UnitConverterUnits::Weight_SoccerBall, 0.4325 },
-            { ViewMode::Weight, UnitConverterUnits::Weight_Elephant, 4000 },
-            { ViewMode::Weight, UnitConverterUnits::Weight_Whale, 90000 },
+                                                   { ViewMode::Weight, UnitConverterUnits::Weight_Kilogram, 1 },
+                                                   { ViewMode::Weight, UnitConverterUnits::Weight_Hectogram, 0.1 },
+                                                   { ViewMode::Weight, UnitConverterUnits::Weight_Decagram, 0.01 },
+                                                   { ViewMode::Weight, UnitConverterUnits::Weight_Gram, 0.001 },
+                                                   { ViewMode::Weight, UnitConverterUnits::Weight_Pound, 0.45359237 },
+                                                   { ViewMode::Weight, UnitConverterUnits::Weight_Ounce, 0.028349523125 },
+                                                   { ViewMode::Weight, UnitConverterUnits::Weight_Milligram, 0.000001 },
+                                                   { ViewMode::Weight, UnitConverterUnits::Weight_Centigram, 0.00001 },
+                                                   { ViewMode::Weight, UnitConverterUnits::Weight_Decigram, 0.0001 },
+                                                   { ViewMode::Weight, UnitConverterUnits::Weight_LongTon, 1016.0469088 },
+                                                   { ViewMode::Weight, UnitConverterUnits::Weight_Tonne, 1000 },
+                                                   { ViewMode::Weight, UnitConverterUnits::Weight_Stone, 6.35029318 },
+                                                   { ViewMode::Weight, UnitConverterUnits::Weight_Carat, 0.0002 },
+                                                   { ViewMode::Weight, UnitConverterUnits::Weight_ShortTon, 907.18474 },
+                                                   { ViewMode::Weight, UnitConverterUnits::Weight_Snowflake, 0.000002 },
+                                                   { ViewMode::Weight, UnitConverterUnits::Weight_SoccerBall, 0.4325 },
+                                                   { ViewMode::Weight, UnitConverterUnits::Weight_Elephant, 4000 },
+                                                   { ViewMode::Weight, UnitConverterUnits::Weight_Whale, 90000 },
 
-            { ViewMode::Speed, UnitConverterUnits::Speed_CentimetersPerSecond, 1 },
-            { ViewMode::Speed, UnitConverterUnits::Speed_FeetPerSecond, 30.48 },
-            { ViewMode::Speed, UnitConverterUnits::Speed_KilometersPerHour, 27.777777777777777777778 },
-            { ViewMode::Speed, UnitConverterUnits::Speed_Knot, 51.44 },
-            { ViewMode::Speed, UnitConverterUnits::Speed_Mach, 34030 },
-            { ViewMode::Speed, UnitConverterUnits::Speed_MetersPerSecond, 100 },
-            { ViewMode::Speed, UnitConverterUnits::Speed_MilesPerHour, 44.7 },
-            { ViewMode::Speed, UnitConverterUnits::Speed_Turtle, 8.94 },
-            { ViewMode::Speed, UnitConverterUnits::Speed_Horse, 2011.5 },
-            { ViewMode::Speed, UnitConverterUnits::Speed_Jet, 24585 },
+                                                   { ViewMode::Speed, UnitConverterUnits::Speed_CentimetersPerSecond, 1 },
+                                                   { ViewMode::Speed, UnitConverterUnits::Speed_FeetPerSecond, 30.48 },
+                                                   { ViewMode::Speed, UnitConverterUnits::Speed_KilometersPerHour, 27.777777777777777777778 },
+                                                   { ViewMode::Speed, UnitConverterUnits::Speed_Knot, 51.44 },
+                                                   { ViewMode::Speed, UnitConverterUnits::Speed_Mach, 34030 },
+                                                   { ViewMode::Speed, UnitConverterUnits::Speed_MetersPerSecond, 100 },
+                                                   { ViewMode::Speed, UnitConverterUnits::Speed_MilesPerHour, 44.7 },
+                                                   { ViewMode::Speed, UnitConverterUnits::Speed_Turtle, 8.94 },
+                                                   { ViewMode::Speed, UnitConverterUnits::Speed_Horse, 2011.5 },
+                                                   { ViewMode::Speed, UnitConverterUnits::Speed_Jet, 24585 },
 
-            { ViewMode::Angle, UnitConverterUnits::Angle_Degree, 1 },
-            { ViewMode::Angle, UnitConverterUnits::Angle_Radian, 57.29577951308233 },
-            { ViewMode::Angle, UnitConverterUnits::Angle_Gradian, 0.9 },
+                                                   { ViewMode::Angle, UnitConverterUnits::Angle_Degree, 1 },
+                                                   { ViewMode::Angle, UnitConverterUnits::Angle_Radian, 57.29577951308233 },
+                                                   { ViewMode::Angle, UnitConverterUnits::Angle_Gradian, 0.9 },
 
-            { ViewMode::Pressure, UnitConverterUnits::Pressure_Atmosphere, 1 },
-            { ViewMode::Pressure, UnitConverterUnits::Pressure_Bar, 0.9869232667160128 },
-            { ViewMode::Pressure, UnitConverterUnits::Pressure_KiloPascal, 0.0098692326671601 },
-            { ViewMode::Pressure, UnitConverterUnits::Pressure_MillimeterOfMercury, 0.0013155687145324 },
-            { ViewMode::Pressure, UnitConverterUnits::Pressure_Pascal, 9.869232667160128e-6 },
-            { ViewMode::Pressure, UnitConverterUnits::Pressure_PSI, 0.068045961016531 }
-    };
+                                                   { ViewMode::Pressure, UnitConverterUnits::Pressure_Atmosphere, 1 },
+                                                   { ViewMode::Pressure, UnitConverterUnits::Pressure_Bar, 0.9869232667160128 },
+                                                   { ViewMode::Pressure, UnitConverterUnits::Pressure_KiloPascal, 0.0098692326671601 },
+                                                   { ViewMode::Pressure, UnitConverterUnits::Pressure_MillimeterOfMercury, 0.0013155687145324 },
+                                                   { ViewMode::Pressure, UnitConverterUnits::Pressure_Pascal, 9.869232667160128e-6 },
+                                                   { ViewMode::Pressure, UnitConverterUnits::Pressure_PSI, 0.068045961016531 } };
 
     // Populate the hash map and return;
     for (UnitData unitdata : unitDataList)
@@ -563,40 +707,43 @@ void UnitConverterDataLoader::GetConversionData(_In_ unordered_map<ViewMode, uno
             categoryToUnitConversionMap.at(unitdata.categoryId).insert(pair<int, double>(unitdata.unitId, unitdata.factor));
         }
     }
- }
+}
 
- wstring UnitConverterDataLoader::GetLocalizedStringName(String^ stringId)
- {
-     return AppResourceProvider::GetInstance().GetResourceString(stringId)->Data();
- }
+wstring UnitConverterDataLoader::GetLocalizedStringName(String ^ stringId)
+{
+    return AppResourceProvider::GetInstance().GetResourceString(stringId)->Data();
+}
 
- void UnitConverterDataLoader::GetExplicitConversionData(_In_ unordered_map<int, unordered_map<int, UCM::ConversionData>>& unitToUnitConversionList)
- {
-     /* categoryId, ParentUnitId, UnitId, ratio, offset, offsetfirst*/
-     ExplicitUnitConversionData conversionDataList[] = {
-         { ViewMode::Temperature, UnitConverterUnits::Temperature_DegreesCelsius, UnitConverterUnits::Temperature_DegreesCelsius , 1, 0 },
-         { ViewMode::Temperature, UnitConverterUnits::Temperature_DegreesCelsius, UnitConverterUnits::Temperature_DegreesFahrenheit, 1.8, 32 },
-         { ViewMode::Temperature, UnitConverterUnits::Temperature_DegreesCelsius, UnitConverterUnits::Temperature_Kelvin, 1, 273.15 },
-         { ViewMode::Temperature, UnitConverterUnits::Temperature_DegreesFahrenheit, UnitConverterUnits::Temperature_DegreesCelsius, 0.55555555555555555555555555555556, -32, CONVERT_WITH_OFFSET_FIRST },
-         { ViewMode::Temperature, UnitConverterUnits::Temperature_DegreesFahrenheit, UnitConverterUnits::Temperature_DegreesFahrenheit, 1, 0 },
-         { ViewMode::Temperature, UnitConverterUnits::Temperature_DegreesFahrenheit, UnitConverterUnits::Temperature_Kelvin, 0.55555555555555555555555555555556, 459.67, CONVERT_WITH_OFFSET_FIRST },
-         { ViewMode::Temperature, UnitConverterUnits::Temperature_Kelvin, UnitConverterUnits::Temperature_DegreesCelsius, 1, -273.15, CONVERT_WITH_OFFSET_FIRST },
-         { ViewMode::Temperature, UnitConverterUnits::Temperature_Kelvin, UnitConverterUnits::Temperature_DegreesFahrenheit, 1.8, -459.67 },
-         { ViewMode::Temperature, UnitConverterUnits::Temperature_Kelvin, UnitConverterUnits::Temperature_Kelvin, 1, 0 }
-     };
+void UnitConverterDataLoader::GetExplicitConversionData(_In_ unordered_map<int, unordered_map<int, UCM::ConversionData>>& unitToUnitConversionList)
+{
+    /* categoryId, ParentUnitId, UnitId, ratio, offset, offsetfirst*/
+    ExplicitUnitConversionData conversionDataList[] = {
+        { ViewMode::Temperature, UnitConverterUnits::Temperature_DegreesCelsius, UnitConverterUnits::Temperature_DegreesCelsius, 1, 0 },
+        { ViewMode::Temperature, UnitConverterUnits::Temperature_DegreesCelsius, UnitConverterUnits::Temperature_DegreesFahrenheit, 1.8, 32 },
+        { ViewMode::Temperature, UnitConverterUnits::Temperature_DegreesCelsius, UnitConverterUnits::Temperature_Kelvin, 1, 273.15 },
+        { ViewMode::Temperature, UnitConverterUnits::Temperature_DegreesFahrenheit, UnitConverterUnits::Temperature_DegreesCelsius,
+          0.55555555555555555555555555555556, -32, CONVERT_WITH_OFFSET_FIRST },
+        { ViewMode::Temperature, UnitConverterUnits::Temperature_DegreesFahrenheit, UnitConverterUnits::Temperature_DegreesFahrenheit, 1, 0 },
+        { ViewMode::Temperature, UnitConverterUnits::Temperature_DegreesFahrenheit, UnitConverterUnits::Temperature_Kelvin, 0.55555555555555555555555555555556,
+          459.67, CONVERT_WITH_OFFSET_FIRST },
+        { ViewMode::Temperature, UnitConverterUnits::Temperature_Kelvin, UnitConverterUnits::Temperature_DegreesCelsius, 1, -273.15,
+          CONVERT_WITH_OFFSET_FIRST },
+        { ViewMode::Temperature, UnitConverterUnits::Temperature_Kelvin, UnitConverterUnits::Temperature_DegreesFahrenheit, 1.8, -459.67 },
+        { ViewMode::Temperature, UnitConverterUnits::Temperature_Kelvin, UnitConverterUnits::Temperature_Kelvin, 1, 0 }
+    };
 
-     // Populate the hash map and return;
-     for (ExplicitUnitConversionData data : conversionDataList)
-     {
-         if (unitToUnitConversionList.find(data.parentUnitId) == unitToUnitConversionList.end())
-         {
-             unordered_map<int, UCM::ConversionData> conversionData;
-             conversionData.insert(pair<int, UCM::ConversionData>(data.unitId, static_cast<UCM::ConversionData>(data)));
-             unitToUnitConversionList.insert(pair<int, unordered_map<int, UCM::ConversionData>>(data.parentUnitId, conversionData));
-         }
-         else
-         {
-             unitToUnitConversionList.at(data.parentUnitId).insert(pair<int, UCM::ConversionData>(data.unitId, static_cast<UCM::ConversionData>(data)));
-         }
-     }
- }
+    // Populate the hash map and return;
+    for (ExplicitUnitConversionData data : conversionDataList)
+    {
+        if (unitToUnitConversionList.find(data.parentUnitId) == unitToUnitConversionList.end())
+        {
+            unordered_map<int, UCM::ConversionData> conversionData;
+            conversionData.insert(pair<int, UCM::ConversionData>(data.unitId, static_cast<UCM::ConversionData>(data)));
+            unitToUnitConversionList.insert(pair<int, unordered_map<int, UCM::ConversionData>>(data.parentUnitId, conversionData));
+        }
+        else
+        {
+            unitToUnitConversionList.at(data.parentUnitId).insert(pair<int, UCM::ConversionData>(data.unitId, static_cast<UCM::ConversionData>(data)));
+        }
+    }
+}

src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h

@@ -12,9 +12,12 @@ namespace CalculatorApp
     {
         struct OrderedUnit : UnitConversionManager::Unit
         {
-            OrderedUnit(){}
+            OrderedUnit()
+            {
+            }
 
-            OrderedUnit(int id, std::wstring name, std::wstring abbreviation, int order, bool isConversionSource = false, bool isConversionTarget = false, bool isWhimsical = false)
+            OrderedUnit(int id, std::wstring name, std::wstring abbreviation, int order, bool isConversionSource = false, bool isConversionTarget = false,
+                        bool isWhimsical = false)
                 : UnitConversionManager::Unit(id, name, abbreviation, isConversionSource, isConversionTarget, isWhimsical), order(order)
             {
             }
@@ -31,11 +34,13 @@ namespace CalculatorApp
 
         struct ExplicitUnitConversionData : UnitConversionManager::ConversionData
         {
-            ExplicitUnitConversionData(){}
-            ExplicitUnitConversionData(CalculatorApp::Common::ViewMode categoryId, int parentUnitId, int unitId, double ratio, double offset, bool offsetFirst = false) :
-                categoryId(categoryId), parentUnitId(parentUnitId), unitId(unitId), UnitConversionManager::ConversionData(ratio, offset, offsetFirst)
+            ExplicitUnitConversionData()
+            {
+            }
+            ExplicitUnitConversionData(CalculatorApp::Common::ViewMode categoryId, int parentUnitId, int unitId, double ratio, double offset,
+                                       bool offsetFirst = false)
+                : categoryId(categoryId), parentUnitId(parentUnitId), unitId(unitId), UnitConversionManager::ConversionData(ratio, offset, offsetFirst)
             {
-
             }
 
             CalculatorApp::Common::ViewMode categoryId;
@@ -43,32 +48,33 @@ namespace CalculatorApp
             int unitId;
         };
 
-        class UnitConverterDataLoader : public UnitConversionManager::IConverterDataLoader,
-            public std::enable_shared_from_this<UnitConverterDataLoader>
+        class UnitConverterDataLoader : public UnitConversionManager::IConverterDataLoader, public std::enable_shared_from_this<UnitConverterDataLoader>
         {
         public:
-            UnitConverterDataLoader(Windows::Globalization::GeographicRegion^ region);
+            UnitConverterDataLoader(Windows::Globalization::GeographicRegion ^ region);
 
         private:
             // IConverterDataLoader
             void LoadData() override;
             std::vector<UnitConversionManager::Category> LoadOrderedCategories() override;
             std::vector<UnitConversionManager::Unit> LoadOrderedUnits(const UnitConversionManager::Category& c) override;
-            std::unordered_map<UnitConversionManager::Unit, UnitConversionManager::ConversionData, UnitConversionManager::UnitHash> LoadOrderedRatios(const UnitConversionManager::Unit& unit) override;
+            std::unordered_map<UnitConversionManager::Unit, UnitConversionManager::ConversionData, UnitConversionManager::UnitHash>
+            LoadOrderedRatios(const UnitConversionManager::Unit& unit) override;
             bool SupportsCategory(const UnitConversionManager::Category& target) override;
             // IConverterDataLoader
 
             void GetCategories(_In_ std::shared_ptr<std::vector<UnitConversionManager::Category>> categoriesList);
             void GetUnits(_In_ std::unordered_map<CalculatorApp::Common::ViewMode, std::vector<CalculatorApp::ViewModel::OrderedUnit>>& unitMap);
             void GetConversionData(_In_ std::unordered_map<CalculatorApp::Common::ViewMode, std::unordered_map<int, double>>& categoryToUnitConversionMap);
-            void GetExplicitConversionData(_In_ std::unordered_map<int, std::unordered_map<int, UnitConversionManager::ConversionData>>& unitToUnitConversionList);
+            void
+            GetExplicitConversionData(_In_ std::unordered_map<int, std::unordered_map<int, UnitConversionManager::ConversionData>>& unitToUnitConversionList);
 
-            std::wstring GetLocalizedStringName(_In_ Platform::String^ stringId);
+            std::wstring GetLocalizedStringName(_In_ Platform::String ^ stringId);
 
             std::shared_ptr<std::vector<UnitConversionManager::Category>> m_categoryList;
             std::shared_ptr<UnitConversionManager::CategoryToUnitVectorMap> m_categoryToUnits;
             std::shared_ptr<UnitConversionManager::UnitToUnitToConversionDataMap> m_ratioMap;
-            Platform::String^ m_currentRegionCode;
+            Platform::String ^ m_currentRegionCode;
         };
     }
 }