         case "use lane":
             // TODO: Handle
             break
-        case let x where x == "rotary" || x == "roundabout":
-            if((step.rotaryName != nil) && ((step.maneuverExit != nil)) && (instructionObject.object(forKey: "name_exit") != nil)) {
-                instructionObject = instructionObject.object(forKey: "name_exit") as! NSDictionary
-            } else if ((step.rotaryName != nil) && (instructionObject.object(forKey: "name") != nil)) {
-                instructionObject = instructionObject.object(forKey: "name") as! NSDictionary
-            } else if ((step.maneuverExit != nil) && (instructionObject.object(forKey: "exit") != nil)) {
-                instructionObject = instructionObject.object(forKey: "exit") as! NSDictionary
+        case "rotary", "roundabout":
+            if step.rotaryName != nil && step.maneuverExit != nil, let nameExit = instructionObject["name_exit"] as? NSDictionary {
+                instructionObject = nameExit
+            } else if step.rotaryName != nil, let name = instructionObject["name"] as? NSDictionary {
+                instructionObject = name
+            } else if step.maneuverExit != nil, let exit = instructionObject["exit"] as? NSDictionary {
+                instructionObject = exit
             } else {
-                instructionObject = instructionObject.object(forKey: "default") as! NSDictionary
+                instructionObject = instructionObject["default"] as! NSDictionary
             }
             break
         default:

        // Decide which instruction string to use
        // Destination takes precedence over name
        var instruction: String
        if ((step.destinations != nil) && instructionObject.object(forKey: "destination") != nil) {
            instruction = instructionObject.object(forKey: "destination") as! String
        } else if ((wayName != "") && instructionObject.object(forKey: "name") != nil) {
            instruction = instructionObject.object(forKey: "name") as! String
        } else {
            instruction = instructionObject.object(forKey: "default") as! String
        }

        // Replace tokens

            maneuverExit: maneuver["exit"] as? Int
        )
    }
}

// Will automatically read correctly-localized Instructions.plist
