tidied up command line options