minor tidying and the start of the command args