Updated to using (?) instead of getOrElse.