Redid this section so the structure isn't so different from other styles.