Cleanup Param Ordering

Basically just shuffling stuff around.