diff --git a/SwiftDDP/DDPClient.swift b/SwiftDDP/DDPClient.swift
index e1fce17..b50d64c 100644
--- a/SwiftDDP/DDPClient.swift
+++ b/SwiftDDP/DDPClient.swift
@@ -102,7 +102,7 @@ extension DDPClient: WebSocketDelegate {
 
 extension DDPClient: WebSocketPongDelegate {
     public func websocketDidReceivePong(socket: WebSocketClient, data: Data?) {
-        heartbeat.addOperation() { self.server.pong = Date() }
+      heartbeat.addOperation() { self.server.pong = Date() }
     }
 }
 
@@ -219,7 +219,7 @@ open class DDPClient: NSObject {
         let numbers = Set<Character>(["0","1","2","3","4","5","6","7","8","9"])
         let uuid = UUID().uuidString.replacingOccurrences(of: "-", with: "")
         var id = ""
-        for character in uuid.characters {
+        for character in uuid {
             if (!numbers.contains(character) && (round(Float(arc4random()) / Float(UINT32_MAX)) == 1)) {
                 id += String(character).lowercased()
             } else {
diff --git a/SwiftDDP/DDPUtilities.swift b/SwiftDDP/DDPUtilities.swift
index 0cced73..38740e4 100644
--- a/SwiftDDP/DDPUtilities.swift
+++ b/SwiftDDP/DDPUtilities.swift
@@ -28,8 +28,8 @@ func randomBase64String(_ n: Int = 20) -> String {
     let BASE64_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_"
     
     for _ in 1...n {
-        let r = arc4random() % UInt32(BASE64_CHARS.characters.count)
-        let index = BASE64_CHARS.characters.index(BASE64_CHARS.startIndex, offsetBy: Int(r))
+        let r = arc4random() % UInt32(BASE64_CHARS.count)
+        let index = BASE64_CHARS.index(BASE64_CHARS.startIndex, offsetBy: Int(r))
         let c = BASE64_CHARS[index]
         string += String(c)
     }