updated templates to use heredoc and new styles