refactored the templates to be a little cleaner.
Merge pull request #8 from Bikerowave/refactorTemplate

Refactored the templates to be a little cleaner.