ch 6 toc DRY edit