small refactor to options