Improve command-line driver