edited spacing and headings
merged @yaodaniel with mine