Template cleanup for code standards.
Merge pull request #30 from shawncoots/codeclean

Template cleanup for code standards.