Refactor Option\Some