refactoring, removed duplicated templates