Instead of case match, using map and getOrElse