Indenting nits
Further improvements to command line args