Refactoring of options stuff.