diff --git a/src/blackmisc/weather/weatherscenario.cpp b/src/blackmisc/weather/weatherscenario.cpp
index a0b5cb850..85ad3d488 100644
--- a/src/blackmisc/weather/weatherscenario.cpp
+++ b/src/blackmisc/weather/weatherscenario.cpp
@@ -12,7 +12,6 @@ namespace BlackMisc
 {
     namespace Weather
     {
-
         void CWeatherScenario::registerMetadata()
         {
             CValueObject<CWeatherScenario>::registerMetadata();
@@ -28,15 +27,12 @@ namespace BlackMisc
         CVariant CWeatherScenario::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
         {
             if (index.isMyself()) { return CVariant::from(*this); }
-            ColumnIndex i = index.frontCasted<ColumnIndex>();
+            const ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
-            case IndexScenarioIndex:
-                return CVariant::fromValue(m_scenarioIndex);
-            case IndexScenarioName:
-                return CVariant::fromValue(m_scenarioName);
-            case IndexScenarioDescription:
-                return CVariant::fromValue(m_scenarioDescription);
+            case IndexScenarioIndex:       return CVariant::fromValue(m_scenarioIndex);
+            case IndexScenarioName:        return CVariant::fromValue(m_scenarioName);
+            case IndexScenarioDescription: return CVariant::fromValue(m_scenarioDescription);
             default:
                 return CValueObject::propertyByIndex(index);
             }
@@ -45,18 +41,12 @@ namespace BlackMisc
         void CWeatherScenario::setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant)
         {
             if (index.isMyself()) { (*this) = variant.to<CWeatherScenario>(); return; }
-            ColumnIndex i = index.frontCasted<ColumnIndex>();
+            const ColumnIndex i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
-            case IndexScenarioIndex:
-                setIndex(variant.value<ScenarioIndex>());
-                break;
-            case IndexScenarioName:
-                setName(variant.value<QString>());
-                break;
-            case IndexScenarioDescription:
-                setDescription(variant.value<QString>());
-                break;
+            case IndexScenarioIndex: setIndex(variant.value<ScenarioIndex>()); break;
+            case IndexScenarioName:  setName(variant.value<QString>()); break;
+            case IndexScenarioDescription: setDescription(variant.value<QString>()); break;
             default:
                 CValueObject::setPropertyByIndex(index, variant);
                 break;
diff --git a/src/blackmisc/weather/weatherscenario.h b/src/blackmisc/weather/weatherscenario.h
index 9ce3f3998..5eae3b425 100644
--- a/src/blackmisc/weather/weatherscenario.h
+++ b/src/blackmisc/weather/weatherscenario.h
@@ -84,8 +84,8 @@ namespace BlackMisc
 
         private:
             ScenarioIndex m_scenarioIndex = ClearSky;
-            QString m_scenarioName;
-            QString m_scenarioDescription;
+            QString m_scenarioName {"Clear Sky"};
+            QString m_scenarioDescription {"Clear Sky default"};
 
             BLACK_METACLASS(
                 CWeatherScenario,