Canonical

Let's clean up some of these comments.