Primarily cosmetic changes
Another attempt at fixing util/connect-landmarks