Refactoring options props