Some modest markup clean-up and reorganization.

Death to the horizontal rule.