Removed match methods from option.
Refactored.