Eureka

make code more readable using if let where instead of a if let follow by a nested if