slight refactor of options