Template cleanup
Merge pull request #2 from brint/master

Template cleanup