little templates clean-up