Refactoring of options