Reorder statements a bit