Options class method refactoring