Reindent/reorder.