Moving things around to make it more readable.