refactoring. avoid Option#get
Merge pull request #152 from xuwei-k/avoid-option-get

refactoring. avoid Option#get