Clean up template comments. Resolves #16