Yet another refactoring/clean of the options logic