refactor current templates