Cleanup and sortable table