Cleanup some code

Switch to switch.. (go syntax)

gateway.go

@@ -9,10 +9,10 @@ import (
 )
 
 type Gateway struct {
+	client   MQTT.Client
 	engine   *xaal.Engine
 	devices  map[string]*Z2MDevice
 	baseAddr uuid.UUID
-	client   MQTT.Client
 }
 
 var (

xaal.go

@@ -166,9 +166,10 @@ func (dev *PowerRelay) update(payload map[string]interface{}) {
 	value, exists := payload[dev.Property].(string)
 	if exists {
 		power := dev.GetAttribute("power")
-		if value == "ON" {
+		switch value {
+		case "ON":
 			power.SetValue(true)
-		} else if value == "OFF" {
+		case "OFF":
 			power.SetValue(false)
 		}
 	}
@@ -232,9 +233,10 @@ func (dev *Lamp) update(payload map[string]interface{}) {
 	value, exists := payload["state"].(string)
 	if exists {
 		light := dev.GetAttribute("light")
-		if value == "ON" {
+		switch value {
+		case "ON":
 			light.SetValue(true)
-		} else {
+		case "OFF":
 			light.SetValue(false)
 		}
 	}

z2m.go

@@ -45,8 +45,7 @@ type Z2MDevice struct {
 	IeeeAddress  string `json:"ieee_address"`
 	SwBuildID    string `json:"software_build_id"`
 	FriendlyName string `json:"friendly_name"`
-	// Manufacturer string `json:"manufacturer"` // TODO: This is quite the same as Vendor / Model
-	XAALDevices []XAALDeviceInterface
+	XAALDevices  []XAALDeviceInterface
 }
 
 type Expose struct {