Refactoring ooni.templates.DNST