Change ordering to make code more readable.