Function args minor reshuffle