Issue #10 - trying to make the template more DRY

see Issue #10 for explanations.