Better handling of command line arguments