Clean up argument parsing