Working on refactoring with options