fix duplicate template tags and make YAML consistent in style