Changed use of option to be more idiomatic functional
Changed use of option to be more idiomatic functional