cleanup template a little bit