Cleanup and sorted typove-domy