Reindent/reorder