Cleaning up CLI options