Move args around
Meh. cleanup