Started refactoring templates