Cleaned up ARGV handling