Make better command line options