cleanup template with suggestions from Issue #3