Clear up the options a little bit