Refactor default template