             }
             laneInstruction = (((instructions["constants"]) as! NSDictionary)["lanes"] as! NSDictionary)[laneConfig ?? ""] as? String
 
-            if (laneInstruction == nil) {
-                // If the lane configuration is not found, default to continue
+            if laneInstruction == nil {
+                // Lane configuration is not found, default to continue
                 instructionObject = ((instructions["use lane"]) as! NSDictionary)["no_lanes"] as! NSDictionary
             }
 

        let modifierConstant =
            (((instructions["constants"]) as! NSDictionary)["modifier"] as! NSDictionary)[modifier ?? "straight"] as! String
        var bearing: Int? = nil
        if (step.finalHeading != nil) { bearing = Int(step.finalHeading! as Double) }

        // Replace tokens
        let scanner = Scanner(string: instruction)
        scanner.charactersToBeSkipped = nil
        var result = ""
        while (!scanner.isAtEnd) {
            var buffer: NSString?

            if scanner.scanUpTo("{", into: &buffer) {

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