Refactor Options.

Fxes #7.