diff --git a/core/table.go b/core/table.go
index 1c6d4e61..63f8def6 100644
--- a/core/table.go
+++ b/core/table.go
@@ -46,9 +46,9 @@ func getPads(s string, maxLen int, align Alignment) (lPad int, rPad int) {
 	} else if align == AlignCenter {
 		lPad = diff / 2
 		rPad = diff - lPad + 1
-	} else {
-		// TODO
-	}
+	} /* else {
+		TODO
+	} */
 
 	return
 }
diff --git a/firewall/firewall_linux.go b/firewall/firewall_linux.go
index 8a817ead..0f18bb2a 100644
--- a/firewall/firewall_linux.go
+++ b/firewall/firewall_linux.go
@@ -23,7 +23,7 @@ func Make(iface *network.Endpoint) FirewallManager {
 	firewall := &LinuxFirewall{
 		iface:        iface,
 		forwarding:   false,
-		redirections: make(map[string]*Redirection, 0),
+		redirections: make(map[string]*Redirection),
 	}
 
 	firewall.forwarding = firewall.IsForwardingEnabled()
@@ -45,11 +45,8 @@ func (f LinuxFirewall) enableFeature(filename string, enable bool) error {
 	}
 	defer fd.Close()
 
-	if _, err = fd.WriteString(value); err != nil {
-		return err
-	}
-
-	return nil
+	_, err = fd.WriteString(value)
+	return err
 }
 
 func (f LinuxFirewall) IsForwardingEnabled() bool {
@@ -67,7 +64,7 @@ func (f LinuxFirewall) EnableForwarding(enabled bool) error {
 
 func (f *LinuxFirewall) getCommandLine(r *Redirection, enabled bool) (cmdLine []string) {
 	action := "-A"
-	if enabled == false {
+	if !enabled {
 		action = "-D"
 	}
 
@@ -102,8 +99,8 @@ func (f *LinuxFirewall) EnableRedirection(r *Redirection, enabled bool) error {
 	rkey := r.String()
 	_, found := f.redirections[rkey]
 
-	if enabled == true {
-		if found == true {
+	if !enabled {
+		if found {
 			return fmt.Errorf("Redirection '%s' already enabled.", rkey)
 		}
 
@@ -116,7 +113,7 @@ func (f *LinuxFirewall) EnableRedirection(r *Redirection, enabled bool) error {
 			return err
 		}
 	} else {
-		if found == false {
+		if !found {
 			return nil
 		}
 
diff --git a/modules/ble_recon.go b/modules/ble_recon.go
index 8eb57690..e3073a31 100644
--- a/modules/ble_recon.go
+++ b/modules/ble_recon.go
@@ -241,8 +241,11 @@ func (d *BLERecon) onPeriphDisconnected(p gatt.Peripheral, err error) {
 }
 
 func (d *BLERecon) onPeriphConnected(p gatt.Peripheral, err error) {
-	// timed out
-	if d.currDevice == nil {
+	if err != nil {
+		log.Warning("Connected to %s but with error: %s", p.ID(), err)
+		return
+	} else if d.currDevice == nil {
+		// timed out
 		log.Warning("Connected to %s but after the timeout :(", p.ID())
 		return
 	}
diff --git a/modules/events_stream.go b/modules/events_stream.go
index 8a0787f1..1fc6e644 100644
--- a/modules/events_stream.go
+++ b/modules/events_stream.go
@@ -162,7 +162,6 @@ func (s *EventsStream) Start() error {
 				} else {
 					log.Debug("Skipping ignored event %v", e)
 				}
-				break
 
 			case <-s.quit:
 				return
diff --git a/modules/mac_changer.go b/modules/mac_changer.go
index 2310ac73..2ca70fda 100644
--- a/modules/mac_changer.go
+++ b/modules/mac_changer.go
@@ -81,9 +81,9 @@ func (mc *MacChanger) Configure() (err error) {
 }
 
 func (mc *MacChanger) setMac(mac net.HardwareAddr) error {
-	os := runtime.GOOS
-	args := []string{}
+	var args []string
 
+	os := runtime.GOOS
 	if strings.Contains(os, "bsd") || os == "darwin" {
 		args = []string{mc.iface, "ether", mac.String()}
 	} else if os == "linux" || os == "android" {