Add comments plus minor changes

Mostly to make golint happy.
refactor Intersection code to make `go vet` happy