Better command line args handling