Refactor options index

all specs passing