cleanup
performance increase
toc numbers