diff --git a/ApplicationLibrary/LubyTransform/EncodedBlock.swift b/ApplicationLibrary/LubyTransform/EncodedBlock.swift
index 790b583..63802f6 100644
--- a/ApplicationLibrary/LubyTransform/EncodedBlock.swift
+++ b/ApplicationLibrary/LubyTransform/EncodedBlock.swift
@@ -8,7 +8,7 @@ struct EncodedBlock {
     let bytes: Int
     let checksum: UInt32
 
-    // Binary format: degree(4) + indices(4*n) + k(4) + bytes(4) + checksum(4) + data
+    /// Binary format: degree(4) + indices(4*n) + k(4) + bytes(4) + checksum(4) + data
     func toBinary() -> Data {
         var result = Data()
 
diff --git a/ApplicationLibrary/LubyTransform/LubyTransformDecoder.swift b/ApplicationLibrary/LubyTransform/LubyTransformDecoder.swift
index 25286fb..2c3c62b 100644
--- a/ApplicationLibrary/LubyTransform/LubyTransformDecoder.swift
+++ b/ApplicationLibrary/LubyTransform/LubyTransformDecoder.swift
@@ -12,19 +12,26 @@ final class LubyTransformDecoder {
     private var disposedEncodedBlocks: [Int: [() -> Void]] = [:]
     private(set) var meta: EncodedBlock?
 
-    var k: Int { meta?.k ?? 0 }
+    var k: Int {
+        meta?.k ?? 0
+    }
+
     var progress: Double {
         guard k > 0 else { return 0 }
         return Double(decodedCount) / Double(k)
     }
 
-    var isComplete: Bool { meta != nil && decodedCount == k }
+    var isComplete: Bool {
+        meta != nil && decodedCount == k
+    }
 
     private class BlockWrapper: Hashable {
         var block: EncodedBlock
         let id = UUID()
 
-        init(_ block: EncodedBlock) { self.block = block }
+        init(_ block: EncodedBlock) {
+            self.block = block
+        }
 
         static func == (lhs: BlockWrapper, rhs: BlockWrapper) -> Bool {
             lhs.id == rhs.id
diff --git a/ApplicationLibrary/LubyTransform/LubyTransformEncoder.swift b/ApplicationLibrary/LubyTransform/LubyTransformEncoder.swift
index 14eb14f..931f2d6 100644
--- a/ApplicationLibrary/LubyTransform/LubyTransformEncoder.swift
+++ b/ApplicationLibrary/LubyTransform/LubyTransformEncoder.swift
@@ -92,7 +92,7 @@ final class LubyTransformEncoder {
         )
     }
 
-    // Ideal Soliton Distribution for degree selection
+    /// Ideal Soliton Distribution for degree selection
     private func getRandomDegree() -> Int {
         guard k > 1 else { return k }
         var probabilities = [Double](repeating: 0, count: k)
diff --git a/ApplicationLibrary/Views/Abstract/AlertState.swift b/ApplicationLibrary/Views/Abstract/AlertState.swift
index ca63d9d..354e918 100644
--- a/ApplicationLibrary/Views/Abstract/AlertState.swift
+++ b/ApplicationLibrary/Views/Abstract/AlertState.swift
@@ -3,7 +3,6 @@ import Library
 import SwiftUI
 
 public extension View {
-    @ViewBuilder
     func alert(_ binding: Binding<AlertState?>, isLoading: Binding<Bool>) -> some View {
         alert(
             binding.wrappedValue?.title ?? "",
diff --git a/ApplicationLibrary/Views/Abstract/DeleteButton.swift b/ApplicationLibrary/Views/Abstract/DeleteButton.swift
index 746f8c1..d71544d 100644
--- a/ApplicationLibrary/Views/Abstract/DeleteButton.swift
+++ b/ApplicationLibrary/Views/Abstract/DeleteButton.swift
@@ -1,7 +1,7 @@
 import Foundation
 import SwiftUI
 
-public struct DeleteButton<Label>: View where Label: View {
+public struct DeleteButton<Label: View>: View {
     private let action: () async -> Void
     private let label: Label
 
diff --git a/ApplicationLibrary/Views/Abstract/ShareButton.swift b/ApplicationLibrary/Views/Abstract/ShareButton.swift
index 35ade79..531b7fa 100644
--- a/ApplicationLibrary/Views/Abstract/ShareButton.swift
+++ b/ApplicationLibrary/Views/Abstract/ShareButton.swift
@@ -8,7 +8,7 @@ import SwiftUI
 #endif
 
 @MainActor
-public struct ProfileShareButton<Label>: View where Label: View {
+public struct ProfileShareButton<Label: View>: View {
     private let alert: Binding<AlertState?>
     private let profile: Profile
     private let label: () -> Label
@@ -40,7 +40,7 @@ public struct ProfileShareButton<Label>: View where Label: View {
     }
 }
 
-public struct ShareButtonCompat<Label>: View where Label: View {
+public struct ShareButtonCompat<Label: View>: View {
     private let label: () -> Label
     private let itemURL: () async throws -> URL
 
@@ -137,8 +137,7 @@ public struct ShareButtonCompat<Label>: View where Label: View {
         }
 
         func makeNSView(context _: Context) -> NSView {
-            let view = NSView()
-            return view
+            NSView()
         }
 
         func updateNSView(_ nsView: NSView, context: Context) {
diff --git a/ApplicationLibrary/Views/Abstract/ViewCompat.swift b/ApplicationLibrary/Views/Abstract/ViewCompat.swift
index 2274783..1c0b58e 100644
--- a/ApplicationLibrary/Views/Abstract/ViewCompat.swift
+++ b/ApplicationLibrary/Views/Abstract/ViewCompat.swift
@@ -7,7 +7,7 @@ public extension View {
         }
     }
 
-    func onChangeCompat<V>(of value: V, _ action: @escaping (_ newValue: V) -> Void) -> some View where V: Equatable {
+    func onChangeCompat<V: Equatable>(of value: V, _ action: @escaping (_ newValue: V) -> Void) -> some View {
         onChange(of: value, perform: action)
     }
 }
diff --git a/ApplicationLibrary/Views/Abstract/ViewModifiers.swift b/ApplicationLibrary/Views/Abstract/ViewModifiers.swift
index 51ee082..caaa99c 100644
--- a/ApplicationLibrary/Views/Abstract/ViewModifiers.swift
+++ b/ApplicationLibrary/Views/Abstract/ViewModifiers.swift
@@ -147,7 +147,6 @@ public extension View {
 #endif
 
 public extension View {
-    @ViewBuilder
     func cardStyle() -> some View {
         modifier(CardStyleModifier())
     }
diff --git a/ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift b/ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift
index 3880a59..b89a13e 100644
--- a/ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift
+++ b/ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift
@@ -152,7 +152,7 @@ import SwiftUI
         #endif
     }
 
-    @ViewBuilder private var overviewPage: some View {
+    private var overviewPage: some View {
         OverviewView(
             $coordinator.profileList,
             $coordinator.selectedProfileID,
diff --git a/ApplicationLibrary/Views/Dashboard/Cards/DashboardCard.swift b/ApplicationLibrary/Views/Dashboard/Cards/DashboardCard.swift
index 5d5e083..dc3f04a 100644
--- a/ApplicationLibrary/Views/Dashboard/Cards/DashboardCard.swift
+++ b/ApplicationLibrary/Views/Dashboard/Cards/DashboardCard.swift
@@ -10,7 +10,9 @@ public enum DashboardCard: String, CaseIterable, Identifiable, Codable, Hashable
     case clashMode
     case profile
 
-    public var id: String { rawValue }
+    public var id: String {
+        rawValue
+    }
 
     public var title: LocalizedStringKey {
         switch self {
diff --git a/ApplicationLibrary/Views/Dashboard/Cards/ProfileCard.swift b/ApplicationLibrary/Views/Dashboard/Cards/ProfileCard.swift
index df4ab72..522c6e7 100644
--- a/ApplicationLibrary/Views/Dashboard/Cards/ProfileCard.swift
+++ b/ApplicationLibrary/Views/Dashboard/Cards/ProfileCard.swift
@@ -188,7 +188,6 @@ public struct ProfileCard: View {
         #endif
     }
 
-    @ViewBuilder
     private func actionButtonsRow(for profile: ProfilePreview) -> some View {
         HStack(spacing: actionButtonSpacing) {
             editButton(for: profile)
@@ -201,7 +200,6 @@ public struct ProfileCard: View {
         }
     }
 
-    @ViewBuilder
     private func editButton(for profile: ProfilePreview) -> some View {
         Button {
             viewModel.profileToEdit = profile.origin
@@ -213,7 +211,6 @@ public struct ProfileCard: View {
         .actionButtonStyle()
     }
 
-    @ViewBuilder
     private func updateButton(for profile: ProfilePreview) -> some View {
         Button {
             viewModel.isUpdating = true
@@ -436,7 +433,6 @@ public struct ProfileCard: View {
         }
     }
 
-    @ViewBuilder
     private func profileInfo(for profile: ProfilePreview) -> some View {
         HStack(spacing: 8) {
             HStack(spacing: 4) {
diff --git a/ApplicationLibrary/Views/Dashboard/Cards/ProfilePickerSheet.swift b/ApplicationLibrary/Views/Dashboard/Cards/ProfilePickerSheet.swift
index ceeb1f6..f8c158c 100644
--- a/ApplicationLibrary/Views/Dashboard/Cards/ProfilePickerSheet.swift
+++ b/ApplicationLibrary/Views/Dashboard/Cards/ProfilePickerSheet.swift
@@ -437,7 +437,6 @@ struct ProfilePickerSheet: View {
     }
 
     #if os(macOS)
-        @ViewBuilder
         private func macOSProfileRow(_ profile: ProfilePreview) -> some View {
             ProfilePickerRow(
                 profile: profile,
@@ -928,7 +927,6 @@ private struct ProfilePickerRow: View {
     }
 
     #if !os(tvOS)
-        @ViewBuilder
         private var shareMenu: some View {
             Menu {
                 #if os(macOS)
@@ -1345,7 +1343,6 @@ private struct ProfilePickerRow: View {
             }
         }
 
-        @ViewBuilder
         private var shareMenu: some View {
             Menu {
                 Button {
diff --git a/ApplicationLibrary/Views/Dashboard/Components/ExtensionStatusView.swift b/ApplicationLibrary/Views/Dashboard/Components/ExtensionStatusView.swift
index 441651b..bf6522a 100644
--- a/ApplicationLibrary/Views/Dashboard/Components/ExtensionStatusView.swift
+++ b/ApplicationLibrary/Views/Dashboard/Components/ExtensionStatusView.swift
@@ -103,7 +103,7 @@ public struct ExtensionStatusView: View {
         }
     }
 
-    private struct StatusItem<T>: View where T: View {
+    private struct StatusItem<T: View>: View {
         @Environment(\.colorScheme) private var colorScheme
 
         private let title: String
diff --git a/ApplicationLibrary/Views/Dashboard/DashboardView.swift b/ApplicationLibrary/Views/Dashboard/DashboardView.swift
index 981e6fc..e3e57b5 100644
--- a/ApplicationLibrary/Views/Dashboard/DashboardView.swift
+++ b/ApplicationLibrary/Views/Dashboard/DashboardView.swift
@@ -48,7 +48,6 @@ public struct DashboardView: View {
         #endif
     }
 
-    @ViewBuilder
     private func importRemoteProfileSheet(for request: ImportRemoteProfileRequest) -> some View {
         NavigationSheet(title: "Import Profile", onDismiss: {
             environments.profileUpdate.send()
@@ -99,7 +98,6 @@ public struct DashboardView: View {
         }
     }
 
-    @ViewBuilder
     private var activeDashboardView: some View {
         ActiveDashboardView(coordinator: coordinator)
     }
diff --git a/ApplicationLibrary/Views/Log/LogView.swift b/ApplicationLibrary/Views/Log/LogView.swift
index c7c5017..49cbe98 100644
--- a/ApplicationLibrary/Views/Log/LogView.swift
+++ b/ApplicationLibrary/Views/Log/LogView.swift
@@ -272,7 +272,6 @@ private struct LogContentInnerView: View {
         #endif
     }
 
-    @ViewBuilder
     private var emptyContent: some View {
         Group {
             if dataModel.isConnected {
@@ -427,7 +426,9 @@ private struct LogContentInnerView: View {
     }
 
     private struct LogTextDocument: FileDocument {
-        static var readableContentTypes: [UTType] { [.plainText] }
+        static var readableContentTypes: [UTType] {
+            [.plainText]
+        }
 
         private let url: URL
 
@@ -466,8 +467,7 @@ private struct LogContentInnerView: View {
             @Binding var alert: AlertState?
 
             func makeNSView(context _: Context) -> NSView {
-                let view = NSView()
-                return view
+                NSView()
             }
 
             func updateNSView(_ nsView: NSView, context _: Context) {
diff --git a/ApplicationLibrary/Views/Log/LogViewModel.swift b/ApplicationLibrary/Views/Log/LogViewModel.swift
index b5331fb..4f51fa9 100644
--- a/ApplicationLibrary/Views/Log/LogViewModel.swift
+++ b/ApplicationLibrary/Views/Log/LogViewModel.swift
@@ -25,8 +25,13 @@ public class LogDataModel: ObservableObject {
 
     private static let maxVisibleLogs = 1000
 
-    public var isEmpty: Bool { commandClient.logList.isEmpty }
-    public var isConnected: Bool { commandClient.isConnected }
+    public var isEmpty: Bool {
+        commandClient.logList.isEmpty
+    }
+
+    public var isConnected: Bool {
+        commandClient.isConnected
+    }
 
     private func updateVisibleLogs() {
         if filteredLogs.count <= Self.maxVisibleLogs {
diff --git a/ApplicationLibrary/Views/Profile/ImportProfileView.swift b/ApplicationLibrary/Views/Profile/ImportProfileView.swift
index 48a8a76..e4de368 100644
--- a/ApplicationLibrary/Views/Profile/ImportProfileView.swift
+++ b/ApplicationLibrary/Views/Profile/ImportProfileView.swift
@@ -28,8 +28,8 @@
                         }
 
                         DevicePicker(
-                            .applicationService(name: "sing-box:profile"))
-                        { endpoint in
+                            .applicationService(name: "sing-box:profile")
+                        ) { endpoint in
                             viewModel.selected = true
                             Task {
                                 await viewModel.handleEndpoint(endpoint, environments: environments)
diff --git a/ApplicationLibrary/Views/Profile/NewProfileView.swift b/ApplicationLibrary/Views/Profile/NewProfileView.swift
index 528e127..8bab972 100644
--- a/ApplicationLibrary/Views/Profile/NewProfileView.swift
+++ b/ApplicationLibrary/Views/Profile/NewProfileView.swift
@@ -11,13 +11,19 @@ public struct NewProfileView: View {
     private var onSuccess: ((Profile) async -> Void)?
 
     public struct ImportRequest: Codable, Hashable, Identifiable {
-        public var id: String { url }
+        public var id: String {
+            url
+        }
+
         public let name: String
         public let url: String
     }
 
     public struct LocalImportRequest: Hashable, Identifiable {
-        public var id: String { fileURL.absoluteString }
+        public var id: String {
+            fileURL.absoluteString
+        }
+
         public let name: String
         public let fileURL: URL
 
diff --git a/ApplicationLibrary/Views/Scanner/QRScannerController+iOS.swift b/ApplicationLibrary/Views/Scanner/QRScannerController+iOS.swift
index c6bd87a..6da0933 100644
--- a/ApplicationLibrary/Views/Scanner/QRScannerController+iOS.swift
+++ b/ApplicationLibrary/Views/Scanner/QRScannerController+iOS.swift
@@ -242,8 +242,7 @@
         let controller: QRScannerController
 
         func makeUIViewController(context _: Context) -> UIViewController {
-            let viewController = QRScannerViewController(controller: controller)
-            return viewController
+            QRScannerViewController(controller: controller)
         }
 
         func updateUIViewController(_: UIViewController, context _: Context) {}
diff --git a/ApplicationLibrary/Views/Scanner/QRScannerController+macOS.swift b/ApplicationLibrary/Views/Scanner/QRScannerController+macOS.swift
index 7b7e22b..7b46dbe 100644
--- a/ApplicationLibrary/Views/Scanner/QRScannerController+macOS.swift
+++ b/ApplicationLibrary/Views/Scanner/QRScannerController+macOS.swift
@@ -247,8 +247,7 @@
         let controller: QRScannerController
 
         func makeNSViewController(context _: Context) -> NSViewController {
-            let viewController = QRScannerViewController(controller: controller)
-            return viewController
+            QRScannerViewController(controller: controller)
         }
 
         func updateNSViewController(_: NSViewController, context _: Context) {}
diff --git a/ApplicationLibrary/Views/Setting/OnDemandRulesView.swift b/ApplicationLibrary/Views/Setting/OnDemandRulesView.swift
index 8c38ac3..1ac50be 100644
--- a/ApplicationLibrary/Views/Setting/OnDemandRulesView.swift
+++ b/ApplicationLibrary/Views/Setting/OnDemandRulesView.swift
@@ -7,7 +7,9 @@ private enum OnDemandMode: String, CaseIterable, Identifiable {
     case alwaysOn
     case enabled
 
-    var id: String { rawValue }
+    var id: String {
+        rawValue
+    }
 
     var name: String {
         switch self {
@@ -114,7 +116,6 @@ public struct OnDemandRulesView: View {
         }
     }
 
-    @ViewBuilder
     private var rulesSection: some View {
         Section {
             if rules.isEmpty {
@@ -463,7 +464,6 @@ private struct OnDemandRuleEditView: View {
         #endif
     }
 
-    @ViewBuilder
     private var connectionRulesSection: some View {
         Section {
             if rule.connectionRules.isEmpty {
diff --git a/ApplicationLibrary/Views/Setting/SettingView.swift b/ApplicationLibrary/Views/Setting/SettingView.swift
index 27fd3b2..534b51a 100644
--- a/ApplicationLibrary/Views/Setting/SettingView.swift
+++ b/ApplicationLibrary/Views/Setting/SettingView.swift
@@ -128,7 +128,6 @@ public struct SettingView: View {
 
     #if os(macOS)
         @MainActor
-        @ViewBuilder
         private static func destinationView(for page: SettingsPage) -> some View {
             Group {
                 switch page {
diff --git a/FileProviderExtension/FileProviderItem.swift b/FileProviderExtension/FileProviderItem.swift
index 6bf5d29..8c2a726 100644
--- a/FileProviderExtension/FileProviderItem.swift
+++ b/FileProviderExtension/FileProviderItem.swift
@@ -95,11 +95,25 @@ class FileProviderItem: NSObject, NSFileProviderItem {
 
     // MARK: - Local File Status
 
-    var isUploaded: Bool { true }
-    var isUploading: Bool { false }
-    var isDownloaded: Bool { true }
-    var isDownloading: Bool { false }
-    var isMostRecentVersionDownloaded: Bool { true }
+    var isUploaded: Bool {
+        true
+    }
+
+    var isUploading: Bool {
+        false
+    }
+
+    var isDownloaded: Bool {
+        true
+    }
+
+    var isDownloading: Bool {
+        false
+    }
+
+    var isMostRecentVersionDownloaded: Bool {
+        true
+    }
 
     private var isDirectory: Bool {
         var isDir: ObjCBool = false
diff --git a/Library/Database/Profile+Transferable.swift b/Library/Database/Profile+Transferable.swift
index 92307bf..22e9bb3 100644
--- a/Library/Database/Profile+Transferable.swift
+++ b/Library/Database/Profile+Transferable.swift
@@ -218,7 +218,9 @@ public extension UTType {
     // MARK: - FileDocument for Export
 
     public struct ProfileExportDocument: FileDocument {
-        public static var readableContentTypes: [UTType] { [.profile] }
+        public static var readableContentTypes: [UTType] {
+            [.profile]
+        }
 
         public let data: Data
         public let filename: String
@@ -245,7 +247,9 @@ public extension UTType {
     }
 
     public struct ProfileJSONExportDocument: FileDocument {
-        public static var readableContentTypes: [UTType] { [.json] }
+        public static var readableContentTypes: [UTType] {
+            [.json]
+        }
 
         public let content: String
         public let filename: String
@@ -274,7 +278,9 @@ public extension UTType {
     }
 
     public struct ProfileAnyExportDocument: FileDocument {
-        public static var readableContentTypes: [UTType] { [.data, .json] }
+        public static var readableContentTypes: [UTType] {
+            [.data, .json]
+        }
 
         public let data: Data
         public let filename: String
diff --git a/Library/Network/CommandClient.swift b/Library/Network/CommandClient.swift
index 25f0f19..9dea6ee 100644
--- a/Library/Network/CommandClient.swift
+++ b/Library/Network/CommandClient.swift
@@ -77,7 +77,10 @@ public class CommandClient: ObservableObject {
     @Published public var isConnected: Bool
     // Coalesce traffic updates so SwiftUI re-renders once per status tick.
     @Published private var trafficSnapshot = TrafficSnapshot()
-    public var status: LibboxStatusMessage? { trafficSnapshot.status }
+    public var status: LibboxStatusMessage? {
+        trafficSnapshot.status
+    }
+
     public var statusPublisher: AnyPublisher<LibboxStatusMessage?, Never> {
         $trafficSnapshot
             .map(\.status)
@@ -97,8 +100,13 @@ public class CommandClient: ObservableObject {
     @Published public var hasAnyConnection: Bool = false
     private var connectionsStore: LibboxConnections?
 
-    public var uplinkHistory: [CGFloat] { trafficSnapshot.uplinkHistory }
-    public var downlinkHistory: [CGFloat] { trafficSnapshot.downlinkHistory }
+    public var uplinkHistory: [CGFloat] {
+        trafficSnapshot.uplinkHistory
+    }
+
+    public var downlinkHistory: [CGFloat] {
+        trafficSnapshot.downlinkHistory
+    }
 
     // Batch processing for logs
     private var pendingLogs: [LogEntry] = []
diff --git a/Library/Network/ExtensionEnvironments.swift b/Library/Network/ExtensionEnvironments.swift
index 51f78d9..34a454a 100644
--- a/Library/Network/ExtensionEnvironments.swift
+++ b/Library/Network/ExtensionEnvironments.swift
@@ -79,7 +79,6 @@ public struct AlertState: Equatable {
 }
 
 public extension View {
-    @ViewBuilder
     func alert(_ binding: Binding<AlertState?>) -> some View {
         alert(
             binding.wrappedValue?.title ?? "",
@@ -119,7 +118,10 @@ public extension View {
 }
 
 public struct ImportRemoteProfileRequest: Hashable, Identifiable {
-    public var id: String { url }
+    public var id: String {
+        url
+    }
+
     public let name: String
     public let url: String
 
diff --git a/Library/Network/ExtensionErrors.swift b/Library/Network/ExtensionErrors.swift
index 82a0c67..ae38063 100644
--- a/Library/Network/ExtensionErrors.swift
+++ b/Library/Network/ExtensionErrors.swift
@@ -19,8 +19,14 @@ extension ExtensionStartupError: LocalizedError {
 }
 
 extension ExtensionStartupError: CustomNSError {
-    public static var errorDomain: String { "ExtensionStartupError" }
-    public var errorCode: Int { 1 }
+    public static var errorDomain: String {
+        "ExtensionStartupError"
+    }
+
+    public var errorCode: Int {
+        1
+    }
+
     public var errorUserInfo: [String: Any] {
         [NSLocalizedDescriptionKey: message]
     }
diff --git a/Library/Network/ExtensionProfile.swift b/Library/Network/ExtensionProfile.swift
index d72f1b6..28c9928 100644
--- a/Library/Network/ExtensionProfile.swift
+++ b/Library/Network/ExtensionProfile.swift
@@ -262,8 +262,7 @@ public class ExtensionProfile: ObservableObject {
         if managers.isEmpty {
             return nil
         }
-        let profile = ExtensionProfile(managers[0])
-        return profile
+        return ExtensionProfile(managers[0])
     }
 
     public static func install() async throws {
diff --git a/Library/Network/OnDemandRule.swift b/Library/Network/OnDemandRule.swift
index c30febd..dca6543 100644
--- a/Library/Network/OnDemandRule.swift
+++ b/Library/Network/OnDemandRule.swift
@@ -7,7 +7,9 @@ public enum OnDemandRuleAction: Int, Codable, CaseIterable, Identifiable {
     case evaluateConnection = 3
     case ignore = 4
 
-    public var id: Int { rawValue }
+    public var id: Int {
+        rawValue
+    }
 
     public var name: String {
         switch self {
@@ -46,7 +48,9 @@ public enum OnDemandRuleInterfaceType: Int, Codable, Identifiable {
         case cellular = 3
     #endif
 
-    public var id: Int { rawValue }
+    public var id: Int {
+        rawValue
+    }
 
     public var name: String {
         switch self {
@@ -80,7 +84,9 @@ public enum EvaluateConnectionRuleAction: Int, Codable, CaseIterable, Identifiab
     case connectIfNeeded = 1
     case neverConnect = 2
 
-    public var id: Int { rawValue }
+    public var id: Int {
+        rawValue
+    }
 
     public var name: String {
         switch self {
diff --git a/Library/Shared/AppConfiguration.swift b/Library/Shared/AppConfiguration.swift
index ddffba1..a5975c9 100644
--- a/Library/Shared/AppConfiguration.swift
+++ b/Library/Shared/AppConfiguration.swift
@@ -22,16 +22,41 @@ public enum AppConfiguration {
         return String(appGroupID[..<dotIndex])
     }
 
-    public static var extensionBundleID: String { "\(packageName).extension" }
-    public static var systemExtensionBundleID: String { "\(packageName).system" }
-    public static var fileProviderDomainID: String { "\(packageName).workingdir" }
-    public static var widgetControlKind: String { "\(packageName).widget.ServiceToggle" }
-    public static var profileUTType: String { "\(packageName).profile" }
-    public static var backgroundTaskID: String { "\(packageName).update_profiles" }
-    public static var iCloudContainerID: String { "iCloud.\(packageName)" }
+    public static var extensionBundleID: String {
+        "\(packageName).extension"
+    }
+
+    public static var systemExtensionBundleID: String {
+        "\(packageName).system"
+    }
+
+    public static var fileProviderDomainID: String {
+        "\(packageName).workingdir"
+    }
+
+    public static var widgetControlKind: String {
+        "\(packageName).widget.ServiceToggle"
+    }
+
+    public static var profileUTType: String {
+        "\(packageName).profile"
+    }
+
+    public static var backgroundTaskID: String {
+        "\(packageName).update_profiles"
+    }
+
+    public static var iCloudContainerID: String {
+        "iCloud.\(packageName)"
+    }
 
     #if os(macOS)
-        public static var rootHelperBundleID: String { "\(packageName).helper" }
-        public static var rootHelperMachService: String { "\(appGroupID).helper" }
+        public static var rootHelperBundleID: String {
+            "\(packageName).helper"
+        }
+
+        public static var rootHelperMachService: String {
+            "\(appGroupID).helper"
+        }
     #endif
 }
diff --git a/MacLibrary/ApplicationDelegate.swift b/MacLibrary/ApplicationDelegate.swift
index 1877423..17135f1 100644
--- a/MacLibrary/ApplicationDelegate.swift
+++ b/MacLibrary/ApplicationDelegate.swift
@@ -25,8 +25,7 @@ open class ApplicationDelegate: NSObject, NSApplicationDelegate, UNUserNotificat
                 ],
                 intentIdentifiers: []
             ),
-        ]
-        )
+        ])
         notificationCenter.delegate = self
         let event = NSAppleEventManager.shared().currentAppleEvent
         let launchedAsLogInItem =
diff --git a/MacLibrary/EditProfileContentWindow.swift b/MacLibrary/EditProfileContentWindow.swift
index f0abaf8..4f6bd5e 100644
--- a/MacLibrary/EditProfileContentWindow.swift
+++ b/MacLibrary/EditProfileContentWindow.swift
@@ -122,7 +122,6 @@ struct EditProfileContentWindow: View {
         }
     }
 
-    @ViewBuilder
     private var defaultEditorView: some View {
         Group {
             if readOnly {
diff --git a/MacLibrary/SidebarView.swift b/MacLibrary/SidebarView.swift
index 224a0f0..e6f7cc4 100644
--- a/MacLibrary/SidebarView.swift
+++ b/MacLibrary/SidebarView.swift
@@ -91,7 +91,6 @@ public struct SidebarView: View {
         }
     }
 
-    @ViewBuilder
     private var disconnectedContent: some View {
         List(selection: $localSelection) {
             ForEach(NavigationPage.allCases.filter { $0.visible(nil) }, id: \.self) { it in
diff --git a/SFI/ApplicationDelegate.swift b/SFI/ApplicationDelegate.swift
index 633a5b7..37e7733 100644
--- a/SFI/ApplicationDelegate.swift
+++ b/SFI/ApplicationDelegate.swift
@@ -29,8 +29,7 @@ class ApplicationDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCe
                 ],
                 intentIdentifiers: []
             ),
-        ]
-        )
+        ])
         notificationCenter.delegate = self
         setup()
         return true
diff --git a/SFI/MainView.swift b/SFI/MainView.swift
index 9167d0a..30a2733 100644
--- a/SFI/MainView.swift
+++ b/SFI/MainView.swift
@@ -57,7 +57,6 @@ struct MainView: View {
         }
     }
 
-    @ViewBuilder
     private var baseTabView: some View {
         tabView(showsBottomAccessory: false)
     }
@@ -66,7 +65,6 @@ struct MainView: View {
         tabView(showsBottomAccessory: shouldShowBottomAccessory)
     }
 
-    @ViewBuilder
     private func tabView(showsBottomAccessory: Bool) -> some View {
         TabView(selection: $selection) {
             ForEach(NavigationPage.allCases, id: \.self) { page in
@@ -95,7 +93,6 @@ struct MainView: View {
         }
     }
 
-    @ViewBuilder
     private func tabBarBackgroundIfAvailable(_ content: some View) -> some View {
         content
     }
diff --git a/SFIUITests/SnapshotTests.swift b/SFIUITests/SnapshotTests.swift
index 3074c82..f875dca 100644
--- a/SFIUITests/SnapshotTests.swift
+++ b/SFIUITests/SnapshotTests.swift
@@ -10,11 +10,11 @@ final class SnapshotTests: XCTestCase {
         app.launch()
     }
 
-    func test01Dashboard() throws {
+    func test01Dashboard() {
         snapshot("01_Dashboard")
     }
 
-    func test02Logs() throws {
+    func test02Logs() {
         if app.tabBars.buttons["Logs"].exists {
             app.tabBars.buttons["Logs"].firstMatch.tap()
         } else if app.buttons["Logs"].exists {
@@ -24,7 +24,7 @@ final class SnapshotTests: XCTestCase {
         snapshot("02_Logs")
     }
 
-    func test03Settings() throws {
+    func test03Settings() {
         // iPad on iOS 18+ uses floating tab bar which creates nested elements
         // Use firstMatch to handle multiple matching elements
         if app.tabBars.buttons["Settings"].exists {
diff --git a/SFMUITests/SnapshotTests.swift b/SFMUITests/SnapshotTests.swift
index bc83708..6b0ce61 100644
--- a/SFMUITests/SnapshotTests.swift
+++ b/SFMUITests/SnapshotTests.swift
@@ -61,17 +61,17 @@ final class SnapshotTests: XCTestCase {
         return nil
     }
 
-    func test01Dashboard() throws {
+    func test01Dashboard() {
         sleep(1)
         snapshot("01_Dashboard")
     }
 
-    func test02Logs() throws {
+    func test02Logs() {
         sleep(1)
         snapshot("02_Logs")
     }
 
-    func test03Settings() throws {
+    func test03Settings() {
         sleep(1)
         snapshot("03_Settings")
     }
diff --git a/SFTUITests/SnapshotTests.swift b/SFTUITests/SnapshotTests.swift
index 2292ad3..5d378de 100644
--- a/SFTUITests/SnapshotTests.swift
+++ b/SFTUITests/SnapshotTests.swift
@@ -55,17 +55,17 @@ final class SnapshotTests: XCTestCase {
         return nil
     }
 
-    func test01Dashboard() throws {
+    func test01Dashboard() {
         sleep(1)
         snapshot("01_Dashboard")
     }
 
-    func test02Logs() throws {
+    func test02Logs() {
         sleep(1)
         snapshot("02_Logs")
     }
 
-    func test03Settings() throws {
+    func test03Settings() {
         sleep(1)
         snapshot("03_Settings")
     }
diff --git a/UITests/SnapshotTests.swift b/UITests/SnapshotTests.swift
index 799b2fd..0215557 100644
--- a/UITests/SnapshotTests.swift
+++ b/UITests/SnapshotTests.swift
@@ -10,7 +10,7 @@ final class SnapshotTests: XCTestCase {
         app.launch()
     }
 
-    func test01Dashboard() throws {
+    func test01Dashboard() {
         #if os(macOS)
             if app.outlines.staticTexts["Dashboard"].exists {
                 app.outlines.staticTexts["Dashboard"].click()
@@ -20,7 +20,7 @@ final class SnapshotTests: XCTestCase {
         snapshot("01_Dashboard")
     }
 
-    func test02Logs() throws {
+    func test02Logs() {
         #if os(iOS)
             if app.tabBars.buttons["Logs"].exists {
                 app.tabBars.buttons["Logs"].firstMatch.tap()
@@ -47,7 +47,7 @@ final class SnapshotTests: XCTestCase {
         snapshot("02_Logs")
     }
 
-    func test03Settings() throws {
+    func test03Settings() {
         #if os(iOS)
             if app.tabBars.buttons["Settings"].exists {
                 app.tabBars.buttons["Settings"].firstMatch.tap()
diff --git a/UITests/UITests.swift b/UITests/UITests.swift
index 4bdef35..12b5bb8 100644
--- a/UITests/UITests.swift
+++ b/UITests/UITests.swift
@@ -22,7 +22,7 @@ final class UITests: XCTestCase {
     }
 
     @MainActor
-    func testExample() throws {
+    func testExample() {
         // UI tests must launch the application that they test.
         let app = XCUIApplication()
         app.launch()
@@ -31,7 +31,7 @@ final class UITests: XCTestCase {
     }
 
     @MainActor
-    func testLaunchPerformance() throws {
+    func testLaunchPerformance() {
         // This measures how long it takes to launch your application.
         measure(metrics: [XCTApplicationLaunchMetric()]) {
             XCUIApplication().launch()
diff --git a/UITests/UITestsLaunchTests.swift b/UITests/UITestsLaunchTests.swift
index 0e245cf..471a44f 100644
--- a/UITests/UITestsLaunchTests.swift
+++ b/UITests/UITestsLaunchTests.swift
@@ -17,7 +17,7 @@ final class UITestsLaunchTests: XCTestCase {
     }
 
     @MainActor
-    func testLaunch() throws {
+    func testLaunch() {
         let app = XCUIApplication()
         app.launch()
 
diff --git a/WidgetExtension/WidgetTunnelControl.swift b/WidgetExtension/WidgetTunnelControl.swift
index 3e3964a..453ebb0 100644
--- a/WidgetExtension/WidgetTunnelControl.swift
+++ b/WidgetExtension/WidgetTunnelControl.swift
@@ -16,7 +16,9 @@ enum WidgetAppConfiguration {
         return value
     }()
 
-    static var widgetControlKind: String { "\(packageName).widget.ServiceToggle" }
+    static var widgetControlKind: String {
+        "\(packageName).widget.ServiceToggle"
+    }
 }
 
 extension NEVPNStatus {
@@ -67,4 +69,3 @@ enum WidgetTunnelControl {
         return managers.first
     }
 }
-