diff --git a/passKit/Models/Password.swift b/passKit/Models/Password.swift
index 1924aaa..2eab7d9 100644
--- a/passKit/Models/Password.swift
+++ b/passKit/Models/Password.swift
@@ -21,6 +21,7 @@ public class Password {
     private var parser = Parser(plainText: "")
     private var additions = [AdditionField]()
     private var firstLineIsOTPField = false
+
     private var otpToken: Token? {
         didSet {
             otpType = OtpType(token: otpToken)
@@ -82,11 +83,11 @@ public class Password {
 
         if self.plainText != plainText {
             self.plainText = plainText
-            changed = changed|PasswordChange.content.rawValue
+            changed |= PasswordChange.content.rawValue
         }
         if self.url != url {
             self.url = url
-            changed = changed|PasswordChange.path.rawValue
+            changed |= PasswordChange.path.rawValue
         }
 
         self.name = name
@@ -171,7 +172,7 @@ public class Password {
             return nil
         }
         var description = otpType.description
-        if case let .timer(period)? = otpToken?.generator.factor {
+        if case let .timer(period) = otpToken!.generator.factor {
             let timeSinceEpoch = Date().timeIntervalSince1970
             let validTime = Int(period - timeSinceEpoch.truncatingRemainder(dividingBy: period))
             description += " (expires in \(validTime)s)"
diff --git a/passKit/Models/PasswordEntity.swift b/passKit/Models/PasswordEntity.swift
index 886d41f..8e5f4ce 100644
--- a/passKit/Models/PasswordEntity.swift
+++ b/passKit/Models/PasswordEntity.swift
@@ -12,13 +12,10 @@ import SwiftyUserDefaults
 extension PasswordEntity {
 
     public var nameWithCategory: String {
-        get {
-            if let p = path, p.hasSuffix(".gpg") {
-                return String(p.prefix(upTo: p.index(p.endIndex, offsetBy: -4)))
-            } else {
-                return ""
-            }
+        if let p = path, p.hasSuffix(".gpg") {
+            return String(p.prefix(upTo: p.index(p.endIndex, offsetBy: -4)))
         }
+        return ""
     }
 
     public func getCategoryText() -> String {