Improve toc formatting