internationalization, template tags cleanup