diff --git a/web/middleware/options.go b/web/middleware/options.go
index f0f0658..4bb7b12 100644
--- a/web/middleware/options.go
+++ b/web/middleware/options.go
@@ -58,9 +58,8 @@ func getValidMethods(c web.C) []string {
 	}
 	if methods, ok := v.([]string); ok {
 		return methods
-	} else {
-		return nil
 	}
+	return nil
 }
 
 // Assumption: the list of methods is teensy, and that anything we could
diff --git a/web/middleware/writer_proxy.go b/web/middleware/writer_proxy.go
index f9cfe94..bd6c097 100644
--- a/web/middleware/writer_proxy.go
+++ b/web/middleware/writer_proxy.go
@@ -16,9 +16,8 @@ func wrapWriter(w http.ResponseWriter) writerProxy {
 	bw := basicWriter{ResponseWriter: w}
 	if cn && fl && hj && rf {
 		return &fancyWriter{bw}
-	} else {
-		return &bw
 	}
+	return &bw
 }
 
 type writerProxy interface {