Improving the -h (help) option