Better generated comments

Addresses #90