Auto-sort and save. Cleanup.