Clean up usage and option parsing