diff --git a/Makefile.am b/Makefile.am
index 1f5b6ca..8340c05 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,7 @@
 	sensorset.cpp \
 	mainloop.cpp \
 	sysfs.cpp \
+	env.cpp \
 	xyz.openbmc_project.Sensor.Value.cpp \
 	xyz.openbmc_project.Sensor.Threshold.Warning.cpp \
 	xyz.openbmc_project.Sensor.Threshold.Critical.cpp
diff --git a/env.cpp b/env.cpp
new file mode 100644
index 0000000..d77200e
--- /dev/null
+++ b/env.cpp
@@ -0,0 +1,40 @@
+/**
+ * Copyright © 2016 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <string>
+#include <cstdlib>
+#include "sensorset.hpp"
+
+std::string getEnv(
+    const char* prefix, const SensorSet::key_type& sensor)
+{
+    std::string key;
+    std::string value;
+
+    key.assign(prefix);
+    key.append(1, '_');
+    key.append(sensor.first);
+    key.append(sensor.second);
+    auto env = getenv(key.c_str());
+    if (env)
+    {
+        value.assign(env);
+    }
+
+    return value;
+}
+
+// vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/env.hpp b/env.hpp
new file mode 100644
index 0000000..20db257
--- /dev/null
+++ b/env.hpp
@@ -0,0 +1,6 @@
+#pragma once
+
+class SensorSet;
+
+std::string getEnv(
+    const char* prefix, const SensorSet::key_type& sensor);
diff --git a/mainloop.cpp b/mainloop.cpp
index df85f26..a59fc1e 100644
--- a/mainloop.cpp
+++ b/mainloop.cpp
@@ -24,6 +24,7 @@
 #include "sysfs.hpp"
 #include "mainloop.hpp"
 #include "util.hpp"
+#include "env.hpp"
 
 using namespace std::literals::chrono_literals;
 
@@ -92,17 +93,10 @@
 
     for (auto& i : *sensors)
     {
+        // Get sensor configuration from the environment.
+
         // Ignore inputs without a label.
-        std::string envKey = "LABEL_" + i.first.first + i.first.second;
-        std::string label;
-
-        auto env = getenv(envKey.c_str());
-
-        if (env)
-        {
-            label.assign(env);
-        }
-
+        auto label = getEnv("LABEL", i.first);
         if (label.empty())
         {
             continue;