Revert "Cleaning up the options class a little bit."
Merge pull request #32 from chrissalij/revert-31-options_cleanup

Revert "Cleaning up the options class a little bit."