diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 61f31a6ec..fec4cd007 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,17 +1,16 @@
-<!--- Please use the appropriate format for your Issue title: -->
+<!-- Please use the appropriate format for your Issue title:
 
-<!-- For a Bug Fix: -->
-<!-- {IA Name} Bug: {Short description of bug} -->
+    For a Bug Fix:
+    {IA Name} Bug: {Short description of bug}
 
-<!-- For a Suggestion:-->
-<!-- {IA Name} Suggestion: {Short description of suggestion}" -->
+    For a Suggestion
+    {IA Name} Suggestion: {Short description of suggestion}
 
-<!-- For Everything Else: -->
-<!-- {IA Name}: {Short description} -->
+    For anything else:
+    {IA Name}: {Short description} -->
 
 
 ## Type of Issue
-
 <!-- Place and 'X' in the correct box (E.g `[X] Triggering`) -->
 
 - [ ] Bug (incorrect behavior)
@@ -22,16 +21,16 @@
     - [ ] Triggers (new triggers)
     - [ ] Design Change
 
-## Description
 
+## Description
 <!-- Describe the bug, or suggestion in detail -->
 
-## Steps to recreate
 
+## Steps to recreate
 <!-- Describe the steps, or provide a link to an example search -->
 
-## People to notify
 
+## People to notify
 <!-- Please @mention any relevant people/organizations here:-->
 
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 58b39e111..560aa0e79 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,19 +1,16 @@
-<!--- Please use the appropriate format for your Pull Request title: -->
+<!-- Use the appropriate format for your Pull Request title:
 
-<!-- For a Bug Fix: -->
-<!-- {IA Name}: {Description of change} -->
+    For a Bug Fix:
+    {IA Name}: {Description of change}
 
-<!-- For a New Instant Answer: -->
-<!-- New {IA Name} Goodie" -->
-<!-- OR -->
-<!-- New {IA Name} CheatSheet" -->
+    For a New Instant Answer:
+    New {IA Name} Goodie/CheatSheet
 
-<!-- For anything else: -->
-<!-- {Tests/Docs/Other}: {Short Description} -->
+    For anything else:
+    {Tests/Docs/Other}: {Short Description} -->
 
 
 ## Type of Change
-
 <!-- Place and 'X' in the correct box (E.g `[X] Improvement`) -->
 
 - [ ] New Instant Answer
@@ -24,31 +21,27 @@
 - [ ] Non–Instant Answer
     - [ ] Other (Role, Template, Test, Documentation, etc.)
 
-## Description of new Instant Answer, or changes
 
-<!-- What does this new Instant Answer do? -->
-<!-- OR -->
-<!-- What changes does this PR introduce? -->
+## Description of new Instant Answer, or changes
+<!-- What does this new Instant Answer do? What changes does this PR introduce? -->
+
 
 ## Related Issues and Discussions
+<!--  Link related issues here to automatically close them when PR is merged
+      E.g. "Fixes #1234" -->
 
-<!--- If fixing a bug with a related issue, please link to the issue here: -->
-<!-- E.g. "Fixes #1234" -->
 
 ## People to notify
-
 <!-- Please @mention any relevant people/organizations here:-->
 
 
 ---
 
-<!-- All new Instant Answers should be related to the Programming Mission -->
-<!-- They should also have a related Project on the DuckDuckHack Forum -->
-<!-- New Instant Answers related to the Programming Mission, without a forum topic will be put on hold -->
-<!-- 	More Info: https://forum.duckduckhack.com/t/duckduckhack-programming-mission-overview/53 -->
-
-Forum Topic:
-
 <!-- The Instant Answer ID can be found by clicking the `?` icon beside the Instant Answer result on DuckDuckGo.com -->
 
 IA Page: https://duck.co/ia/view/{ID}
+
+
+<!-- For Instant Answers related to a forum topic -->
+
+Forum Topic: