style revisions and simplification of cmdline ref