diff --git a/pkg/services/container/ape.go b/pkg/services/container/ape.go
index e1fbe3960..01bd825d7 100644
--- a/pkg/services/container/ape.go
+++ b/pkg/services/container/ape.go
@@ -655,10 +655,8 @@ func (ac *apeChecker) namespaceByOwner(ctx context.Context, owner *refs.OwnerID)
 	subject, err := ac.frostFSIDClient.GetSubject(ctx, addr)
 	if err == nil {
 		namespace = subject.Namespace
-	} else {
-		if !strings.Contains(err.Error(), frostfsidcore.SubjectNotFoundErrorMessage) {
-			return "", fmt.Errorf("get subject error: %w", err)
-		}
+	} else if !strings.Contains(err.Error(), frostfsidcore.SubjectNotFoundErrorMessage) {
+		return "", fmt.Errorf("get subject error: %w", err)
 	}
 	return namespace, nil
 }
diff --git a/pkg/services/object/common/target/target.go b/pkg/services/object/common/target/target.go
index b2ae79dbc..f2bd907db 100644
--- a/pkg/services/object/common/target/target.go
+++ b/pkg/services/object/common/target/target.go
@@ -89,10 +89,8 @@ func newTrustedTarget(ctx context.Context, prm *objectwriter.Params) (transforme
 		if !ownerObj.Equals(ownerSession) {
 			return nil, fmt.Errorf("session token is missing but object owner id (%s) is different from the default key (%s)", ownerObj, ownerSession)
 		}
-	} else {
-		if !ownerObj.Equals(sessionInfo.Owner) {
-			return nil, fmt.Errorf("different token issuer and object owner identifiers %s/%s", sessionInfo.Owner, ownerObj)
-		}
+	} else if !ownerObj.Equals(sessionInfo.Owner) {
+		return nil, fmt.Errorf("different token issuer and object owner identifiers %s/%s", sessionInfo.Owner, ownerObj)
 	}
 
 	if prm.SignRequestPrivateKey == nil {
diff --git a/pkg/services/object_manager/tombstone/checker.go b/pkg/services/object_manager/tombstone/checker.go
index a4e36c2dc..e5f001d5a 100644
--- a/pkg/services/object_manager/tombstone/checker.go
+++ b/pkg/services/object_manager/tombstone/checker.go
@@ -61,10 +61,8 @@ func (g *ExpirationChecker) IsTombstoneAvailable(ctx context.Context, a oid.Addr
 			logs.TombstoneCouldNotGetTheTombstoneTheSource,
 			zap.Error(err),
 		)
-	} else {
-		if ts != nil {
-			return g.handleTS(ctx, addrStr, ts, epoch)
-		}
+	} else if ts != nil {
+		return g.handleTS(ctx, addrStr, ts, epoch)
 	}
 
 	// requested tombstone not
diff --git a/pkg/services/tree/service.go b/pkg/services/tree/service.go
index a00c8c1cd..5349dd13e 100644
--- a/pkg/services/tree/service.go
+++ b/pkg/services/tree/service.go
@@ -436,10 +436,8 @@ func getSortedSubTree(ctx context.Context, srv TreeService_GetSubTreeServer, cid
 		}
 		if ms == nil {
 			ms = m.Items
-		} else {
-			if len(m.Items) != 1 {
-				return status.Error(codes.InvalidArgument, "multiple non-internal nodes provided")
-			}
+		} else if len(m.Items) != 1 {
+			return status.Error(codes.InvalidArgument, "multiple non-internal nodes provided")
 		}
 		ts = append(ts, m.Time)
 		ps = append(ps, p)