Collapse the two definition sections into one