diff --git a/TIAuth/Sources/CodeConfirmPresenter/DefaultCodeConfirmPresenter.swift b/TIAuth/Sources/CodeConfirmPresenter/DefaultCodeConfirmPresenter.swift
index 015301b0..bad77a05 100644
--- a/TIAuth/Sources/CodeConfirmPresenter/DefaultCodeConfirmPresenter.swift
+++ b/TIAuth/Sources/CodeConfirmPresenter/DefaultCodeConfirmPresenter.swift
@@ -74,15 +74,15 @@ open class DefaultCodeConfirmPresenter<ConfirmResponse: CodeConfirmResponse,
         }
     }
 
+    private let codeRefreshTimer = TITimer(mode: .activeAndBackground)
+    private let codeLifetimeTimer = TITimer(mode: .activeAndBackground)
+
     public var output: Output
     public var requests: Requests
     public weak var stateStorage: CodeConfirmStateStorage?
     public var config = Config()
     public var currentCodeResponse: CodeResponse
 
-    private let codeRefreshTimer = TITimer(mode: .activeAndBackground)
-    private let codeLifetimeTimer = TITimer(mode: .activeAndBackground)
-
     public init<Input: CodeResponse>(input: Input,
                                      output: Output,
                                      requests: Requests,
@@ -101,11 +101,9 @@ open class DefaultCodeConfirmPresenter<ConfirmResponse: CodeConfirmResponse,
 
         let confirmResponse = await requests.confirmRequest(code)
 
-        if self.isSuccessConfirm(response: confirmResponse) {
-            handle(successConfirmResponse: confirmResponse)
-        } else {
-            handle(failureConfirmResponse: confirmResponse)
-        }
+        isSuccessConfirm(response: confirmResponse)
+            ? handle(successConfirmResponse: confirmResponse)
+            : handle(failureConfirmResponse: confirmResponse)
 
         stateStorage?.isExecutingRequest = false
     }
@@ -242,7 +240,7 @@ open class DefaultCodeConfirmPresenter<ConfirmResponse: CodeConfirmResponse,
 
         codeRefreshTimer.eventHandler = { [weak self] in
             self?.updateRemaining(nonRefreshableInterval: nonRefreshableInterval,
-                                                        elapsedInterval: $0)
+                                  elapsedInterval: $0)
         }
         codeRefreshTimer.start()
     }
diff --git a/TIMoyaNetworking/Sources/NetworkService/EndpointErrorResult.swift b/TIMoyaNetworking/Sources/NetworkService/EndpointErrorResult.swift
index 2776e057..05cc5f82 100644
--- a/TIMoyaNetworking/Sources/NetworkService/EndpointErrorResult.swift
+++ b/TIMoyaNetworking/Sources/NetworkService/EndpointErrorResult.swift
@@ -23,12 +23,12 @@
 import Moya
 import Foundation
 
-public enum EndpointErrorResult<AE, NE>: Error {
-    case apiError(AE)
-    case networkError(NE)
+public enum EndpointErrorResult<ApiError, NetworkError>: Error {
+    case apiError(ApiError)
+    case networkError(NetworkError)
 }
 
-public extension EndpointErrorResult where NE == MoyaError {
+public extension EndpointErrorResult where NetworkError == MoyaError {
     var isNetworkConnectionProblem: Bool {
         guard case let .networkError(moyaError) = self,
               case let .underlying(error, _) = moyaError,