Better headers, removed redundant subsections