cleanup + sortable improvement