diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index e38a5cb1e8c..624673df8d7 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -23,9 +23,9 @@ Please include steps on how to reproduce the issue. -->
 <details>
   <summary>Logs</summary>
 
-```shell
-your logs here
-```
+      ```shell
+      your logs here
+      ```
 
 </details>
 
@@ -33,7 +33,9 @@ your logs here
 
 <!--A clear and concise description of what you expected to happen. -->
 
-**Details setup (please complete the following information):**
+**Setup:**
+
+<!-- Please complete the following information: -->
 
 - Operating system (e.g. MacOS Monterey)
 - Java version (i.e. `java --version`, e.g. `17.0.3`)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index caae1842773..22cd3227c2e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -20,7 +20,7 @@ Before doing so, please:
 
 When filing a bug report, please include the following:
 - Any relevant information about your environment. This should generally
-  include the output of `java -version`, as well as the version of Error Prone
+  include the output of `java --version`, as well as the version of Error Prone
   you're using.
 - A description of what is going on (e.g. logging output, stacktraces).
 - A minimum reproducible example, so that other developers can try to reproduce