#6: Minor markup tweaks; more semantic