Reorder settings + add comments
Remove duplicated header