Made command line processing more friendly & robust