Better command line handling