DRY out other sections