minor template cleanup
Merge pull request #86 from ray176/cleanup

minor template cleanup