updated some if let ... { } else { } syntax to be more compact and readable using the ?? operator.