tidying up command line options and controller