cleanup template
suggest conditionals in template