Clean up and improve Tabulator.