diff --git a/session/module.go b/session/module.go
index 3d17995c..210d49a0 100644
--- a/session/module.go
+++ b/session/module.go
@@ -62,13 +62,12 @@ func (m SessionModule) ListParam(name string) (err error, values []string) {
 	list := ""
 	if err, list = m.StringParam(name); err != nil {
 		return
-	} else {
-		parts := strings.Split(list, ",")
-		for _, part := range parts {
-			part = core.Trim(part)
-			if part != "" {
-				values = append(values, part)
-			}
+	}
+	parts := strings.Split(list, ",")
+	for _, part := range parts {
+		part = core.Trim(part)
+		if part != "" {
+			values = append(values, part)
 		}
 	}
 	return
@@ -78,33 +77,27 @@ func (m SessionModule) StringParam(name string) (error, string) {
 	if p, found := m.params[name]; found {
 		if err, v := p.Get(m.Session); err != nil {
 			return err, ""
-		} else {
-			return nil, v.(string)
 		}
-	} else {
-		return fmt.Errorf("Parameter %s does not exist.", name), ""
+		return nil, v.(string)
 	}
+	return fmt.Errorf("Parameter %s does not exist.", name), ""
 }
 
 func (m SessionModule) IntParam(name string) (error, int) {
 	if p, found := m.params[name]; found {
 		if err, v := p.Get(m.Session); err != nil {
 			return err, 0
-		} else {
-			return nil, v.(int)
 		}
-
-	} else {
-		return fmt.Errorf("Parameter %s does not exist.", name), 0
+		return nil, v.(int)
 	}
+	return fmt.Errorf("Parameter %s does not exist.", name), 0
 }
 
 func (m SessionModule) BoolParam(name string) (error, bool) {
 	if err, v := m.params[name].Get(m.Session); err != nil {
 		return err, false
-	} else {
-		return nil, v.(bool)
 	}
+	return nil, v.(bool)
 }
 
 func (m *SessionModule) AddHandler(h ModuleHandler) {
@@ -127,9 +120,8 @@ func (m *SessionModule) SetRunning(running bool, cb func()) error {
 	if running == m.Running() {
 		if m.Started {
 			return ErrAlreadyStarted
-		} else {
-			return ErrAlreadyStopped
 		}
+		return ErrAlreadyStopped
 	}
 
 	m.StatusLock.Lock()