Minor eol tweak for empty lines
Simplified argument parsing