idiomatic changes to toc, sort