Added some template comments
Cleaning up the private method names for generated code