[CAL-172]  Clean up the markup a bit.