reorganize and tabify