diff --git a/plugins/hal-tellstick/src/se/hal/plugin/tellstick/TellstickSerialComm.java b/plugins/hal-tellstick/src/se/hal/plugin/tellstick/TellstickSerialComm.java
index e57ecabb..cb1a8279 100644
--- a/plugins/hal-tellstick/src/se/hal/plugin/tellstick/TellstickSerialComm.java
+++ b/plugins/hal-tellstick/src/se/hal/plugin/tellstick/TellstickSerialComm.java
@@ -72,6 +72,10 @@ public class TellstickSerialComm implements Runnable,
         registeredDevices = Collections.synchronizedList(new ArrayList<TellstickDevice>());
     }
 
+    // --------------------------
+    // Lifecycle methods
+    // --------------------------
+
     @Override
     public boolean isAvailable() {
         return HalContext.getStringProperty(CONFIG_TELLSTICK_COM_PORT) != null;
@@ -128,6 +132,10 @@ public class TellstickSerialComm implements Runnable,
         }
     }
 
+    // --------------------------
+    // Tellstick methods
+    // --------------------------
+
     /**
      * There seems to be an issue with read(...) methods, only read() is working
      */
@@ -212,6 +220,9 @@ public class TellstickSerialComm implements Runnable,
         }
     }
 
+    // --------------------------
+    // Hal methods
+    // --------------------------
 
     @Override
     public void register(HalEventConfig event) {