Cleaning up the options system