Removed fromJust in favor of a fromMaybe