Improve getopt UI