cleaning up helper and template file