Clean up command-line argument parsing