Better chapter-name cleaning