Edit for style.
Merge pull request #1544 from braddunbar/intersection

Edit for style.