Better command-line syntax