refactoring. avoid Option#get