Clean up command line option