Tidy up some commandLine stuff