reorganize options spec