Use 'Option.fold()()' instead of '.map()'.

Option.fold()() is the preferred way to do if-else functional logic on Option, so this switches to that format.