Cleaned up argument logic