Remove need to put options in list