Make argument handling cleaner