Refactor options