Improve command line options