template cleanup, validation testing
Merge pull request #12 from jlambert121/cleanup

template cleanup, validation testing