Reordering some stuff for clarity.