Refactored chapters, sections and subsections