Refactor template and templatetags
Rename method for clarity