Cleaned up argument parsing.