cleaning up the way Options are handled in prep for the fun task of conversion