Reorder things a bit