refactoring options
refactoring options