Re-order elements, some tidying