cleanup in the templatetags department