Refactor some use of Option for additional idiomatic-ness