diff --git a/main.go b/main.go
index 43f324e0..a29dd44b 100644
--- a/main.go
+++ b/main.go
@@ -146,13 +146,14 @@ func initAlpm() error {
 		return err
 	}
 
-	if value, _, _ := cmdArgs.getArg("color"); value == "always" {
+	switch value, _, _ := cmdArgs.getArg("color"); value {
+	case "always":
 		useColor = true
-	} else if value == "auto" {
+	case "auto":
 		useColor = isTty()
-	} else if value == "never" {
+	case "never":
 		useColor = false
-	} else {
+	default:
 		useColor = pacmanConf.Color && isTty()
 	}
 
diff --git a/upgrade.go b/upgrade.go
index 3f5c6ab0..1ce9fc44 100644
--- a/upgrade.go
+++ b/upgrade.go
@@ -40,11 +40,12 @@ func (u upSlice) Less(i, j int) bool {
 
 	less := false
 	found := syncDB.ForEach(func(db alpm.DB) error {
-		if db.Name() == u[i].Repository {
+		switch db.Name() {
+		case u[i].Repository:
 			less = true
-		} else if db.Name() == u[j].Repository {
+		case u[j].Repository:
 			less = false
-		} else {
+		default:
 			return nil
 		}