diff --git a/internal/backend/azure/config.go b/internal/backend/azure/config.go
index 15a2e5cf9..66f0125e4 100644
--- a/internal/backend/azure/config.go
+++ b/internal/backend/azure/config.go
@@ -47,9 +47,7 @@ func ParseConfig(s string) (interface{}, error) {
 		return nil, errors.New("azure: invalid format: bucket name or path not found")
 	}
 	container, path := data[0], path.Clean(data[1])
-	if strings.HasPrefix(path, "/") {
-		path = path[1:]
-	}
+	path = strings.TrimPrefix(path, "/")
 	cfg := NewConfig()
 	cfg.Container = container
 	cfg.Prefix = path
diff --git a/internal/backend/gs/config.go b/internal/backend/gs/config.go
index e18066ef9..026ef3dfd 100644
--- a/internal/backend/gs/config.go
+++ b/internal/backend/gs/config.go
@@ -49,9 +49,7 @@ func ParseConfig(s string) (interface{}, error) {
 
 	bucket, path := data[0], path.Clean(data[1])
 
-	if strings.HasPrefix(path, "/") {
-		path = path[1:]
-	}
+	path = strings.TrimPrefix(path, "/")
 
 	cfg := NewConfig()
 	cfg.Bucket = bucket
diff --git a/internal/cache/cache.go b/internal/cache/cache.go
index fd5743b94..0b264e256 100644
--- a/internal/cache/cache.go
+++ b/internal/cache/cache.go
@@ -175,11 +175,7 @@ const MaxCacheAge = 30 * 24 * time.Hour
 
 func validCacheDirName(s string) bool {
 	r := regexp.MustCompile(`^[a-fA-F0-9]{64}$`)
-	if !r.MatchString(s) {
-		return false
-	}
-
-	return true
+	return r.MatchString(s)
 }
 
 // listCacheDirs returns the list of cache directories.
diff --git a/internal/cache/file.go b/internal/cache/file.go
index 36c38ba97..52a767665 100644
--- a/internal/cache/file.go
+++ b/internal/cache/file.go
@@ -214,9 +214,5 @@ func (c *Cache) Has(h restic.Handle) bool {
 	}
 
 	_, err := fs.Stat(c.filename(h))
-	if err == nil {
-		return true
-	}
-
-	return false
+	return err == nil
 }