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

Reverts chrissalij/octo-pr#31