Future templatetag, cleaning and code style