Refactor, create Options