Improve toc