Some code clean up, and comment entry templating.

Marking version 0.4