Cleanup option parsing