Shifted Program Arguments around, quick clean-up for clarity