Cleaning up the options class a little bit.