Just reordering some code.