Merge pull request #401 from jagerman/templates-simplification

Small template simplifications