Reorder/reindent