Cleanup: Use gnu style command line options.