Cleaning up argument validation