diff --git a/device/PowerSensor/PowerSensor.ino b/device/PowerSensor/PowerSensor.ino
index 6c0fd33..d73eb01 100644
--- a/device/PowerSensor/PowerSensor.ino
+++ b/device/PowerSensor/PowerSensor.ino
@@ -278,12 +278,9 @@ void serialEvent() {
       break;
     case 'V':
       // Send firmware version in human-readable format
-      Serial.print("Firmware version: ");
-#ifdef DEMO
       Serial.print(VERSION);
-      Serial.println("-DEMO");
-#else
-      Serial.println(VERSION);
+#ifdef DEMO
+      Serial.print("-DEMO");
 #endif
       break;
     case 'Z':
diff --git a/host/src/psconfig.cc b/host/src/psconfig.cc
index 3623ed0..0867dd7 100644
--- a/host/src/psconfig.cc
+++ b/host/src/psconfig.cc
@@ -127,8 +127,7 @@ void autoCalibrate() {
 
 
 void print() {
-  // firmware version
-  std::cout << powerSensor->getVersion() << std::endl;
+  std::cout << "Device firmware version: " << powerSensor->getVersion() << std::endl;
 
   PowerSensor3::State startState, stopState;
 
diff --git a/host/src/psinfo.cc b/host/src/psinfo.cc
index 9de03aa..3118ee9 100644
--- a/host/src/psinfo.cc
+++ b/host/src/psinfo.cc
@@ -18,8 +18,7 @@ void getPowerSensor(std::string device) {
 
 
 void printInfo() {
-  // firmware version
-  std::cout << powerSensor->getVersion() << std::endl;
+  std::cout << "Device firmware version: " << powerSensor->getVersion() << std::endl;
 
   PowerSensor3::State state = powerSensor->read();