diff --git a/arch/arm/src/qemu/qemu_allocateheap.c b/arch/arm/src/qemu/qemu_allocateheap.c
index e63dc3bd1401d..550ea99c25931 100644
--- a/arch/arm/src/qemu/qemu_allocateheap.c
+++ b/arch/arm/src/qemu/qemu_allocateheap.c
@@ -65,8 +65,8 @@
  *   IDLE thread stack.  Size determined by CONFIG_IDLETHREAD_STACKSIZE.
  *   Heap.  Extends to the end of User SRAM.
  *
- *   The following memory map is assumed for the protect build.
- *   The kernel and user space have it's own dedicated heap space.
+ *   The following memory map is assumed for the protected build.
+ *   The kernel and user space have their own dedicated heap spaces.
  *
  *   User .data region         Size determined at link time
  *   User .bss region          Size determined at link time
diff --git a/arch/risc-v/src/bl808/bl808_allocateheap.c b/arch/risc-v/src/bl808/bl808_allocateheap.c
index b710728715c52..f0b902b9a7a1e 100644
--- a/arch/risc-v/src/bl808/bl808_allocateheap.c
+++ b/arch/risc-v/src/bl808/bl808_allocateheap.c
@@ -65,8 +65,8 @@
  *   IDLE thread stack.  Size determined by CONFIG_IDLETHREAD_STACKSIZE.
  *   Heap.  Extends to the end of User SRAM.
  *
- *   The following memory map is assumed for the protect build.
- *   The kernel and user space have it's own dedicated heap space.
+ *   The following memory map is assumed for the protected build.
+ *   The kernel and user space have their own dedicated heap spaces.
  *
  *   User .data region         Size determined at link time
  *   User .bss region          Size determined at link time
diff --git a/arch/risc-v/src/bl808/bl808_start.c b/arch/risc-v/src/bl808/bl808_start.c
index f92ed3ab47bd6..77323e9911349 100644
--- a/arch/risc-v/src/bl808/bl808_start.c
+++ b/arch/risc-v/src/bl808/bl808_start.c
@@ -224,7 +224,7 @@ void bl808_start_s(int mhartid)
 
   showprogress('B');
 
-  /* Do board initialization */
+  /* TODO: Additional initialization */
 
   showprogress('C');
 
diff --git a/arch/risc-v/src/bl808/chip.h b/arch/risc-v/src/bl808/chip.h
index dde015abba4ec..95ce4b000e88c 100644
--- a/arch/risc-v/src/bl808/chip.h
+++ b/arch/risc-v/src/bl808/chip.h
@@ -49,8 +49,8 @@
  * Name: setintstack
  *
  * Description:
- *   Set the current stack pointer to the  "top" the correct interrupt stack
- *   for the current CPU.
+ *   Set the current stack pointer to the "top" of the correct interrupt
+ *   stack for the current CPU.
  *
  ****************************************************************************/
 
diff --git a/arch/risc-v/src/c906/c906_allocateheap.c b/arch/risc-v/src/c906/c906_allocateheap.c
index d8afdd52b94b4..0cd30fd161503 100644
--- a/arch/risc-v/src/c906/c906_allocateheap.c
+++ b/arch/risc-v/src/c906/c906_allocateheap.c
@@ -63,8 +63,8 @@
  *   IDLE thread stack.  Size determined by CONFIG_IDLETHREAD_STACKSIZE.
  *   Heap.  Extends to the end of User SRAM.
  *
- *   The following memory map is assumed for the protect build.
- *   The kernel and user space have it's own dedicated heap space.
+ *   The following memory map is assumed for the protected build.
+ *   The kernel and user space have their own dedicated heap spaces.
  *
  *   User .data region         Size determined at link time
  *   User .bss region          Size determined at link time
diff --git a/arch/risc-v/src/jh7110/chip.h b/arch/risc-v/src/jh7110/chip.h
index f82e162d54bfe..4f8c369382d48 100644
--- a/arch/risc-v/src/jh7110/chip.h
+++ b/arch/risc-v/src/jh7110/chip.h
@@ -49,8 +49,8 @@
  * Name: setintstack
  *
  * Description:
- *   Set the current stack pointer to the  "top" the correct interrupt stack
- *   for the current CPU.
+ *   Set the current stack pointer to the "top" of the correct interrupt
+ *   stack for the current CPU.
  *
  ****************************************************************************/
 
diff --git a/arch/risc-v/src/jh7110/jh7110_allocateheap.c b/arch/risc-v/src/jh7110/jh7110_allocateheap.c
index 7d4fdafa9f19a..9464d6757a535 100644
--- a/arch/risc-v/src/jh7110/jh7110_allocateheap.c
+++ b/arch/risc-v/src/jh7110/jh7110_allocateheap.c
@@ -65,8 +65,8 @@
  *   IDLE thread stack.  Size determined by CONFIG_IDLETHREAD_STACKSIZE.
  *   Heap.  Extends to the end of User SRAM.
  *
- *   The following memory map is assumed for the protect build.
- *   The kernel and user space have it's own dedicated heap space.
+ *   The following memory map is assumed for the protected build.
+ *   The kernel and user space have their own dedicated heap spaces.
  *
  *   User .data region         Size determined at link time
  *   User .bss region          Size determined at link time
diff --git a/arch/risc-v/src/jh7110/jh7110_start.c b/arch/risc-v/src/jh7110/jh7110_start.c
index 4d987e00c1dfa..27ea000e2e4cf 100644
--- a/arch/risc-v/src/jh7110/jh7110_start.c
+++ b/arch/risc-v/src/jh7110/jh7110_start.c
@@ -99,7 +99,7 @@ void jh7110_start_s(int mhartid)
 
   showprogress('B');
 
-  /* Do board initialization */
+  /* TODO: Additional initialization */
 
   showprogress('C');
 
diff --git a/arch/risc-v/src/k210/chip.h b/arch/risc-v/src/k210/chip.h
index d82818010ad80..7c4b5e017d537 100644
--- a/arch/risc-v/src/k210/chip.h
+++ b/arch/risc-v/src/k210/chip.h
@@ -43,8 +43,8 @@
  * Name: setintstack
  *
  * Description:
- *   Set the current stack pointer to the  "top" the correct interrupt stack
- *   for the current CPU.
+ *   Set the current stack pointer to the "top" of the correct interrupt
+ *   stack for the current CPU.
  *
  ****************************************************************************/
 
diff --git a/arch/risc-v/src/k230/chip.h b/arch/risc-v/src/k230/chip.h
index 1e1066e67d2ab..cf690829aea80 100644
--- a/arch/risc-v/src/k230/chip.h
+++ b/arch/risc-v/src/k230/chip.h
@@ -51,8 +51,8 @@
  * Name: setintstack
  *
  * Description:
- *   Set the current stack pointer to the  "top" the correct interrupt stack
- *   for the current CPU.
+ *   Set the current stack pointer to the "top" of the correct interrupt
+ *   stack for the current CPU.
  *
  ****************************************************************************/
 
diff --git a/arch/risc-v/src/k230/k230_allocateheap.c b/arch/risc-v/src/k230/k230_allocateheap.c
index 7d7c6ceb42563..818d62fc49f01 100644
--- a/arch/risc-v/src/k230/k230_allocateheap.c
+++ b/arch/risc-v/src/k230/k230_allocateheap.c
@@ -75,8 +75,8 @@
  *   IDLE thread stack.  Size determined by CONFIG_IDLETHREAD_STACKSIZE.
  *   Heap.  Extends to the end of User SRAM.
  *
- *   The following memory map is assumed for the protect build.
- *   The kernel and user space have it's own dedicated heap space.
+ *   The following memory map is assumed for the protected build.
+ *   The kernel and user space have their own dedicated heap spaces.
  *
  *   User .data region         Size determined at link time
  *   User .bss region          Size determined at link time
diff --git a/arch/risc-v/src/litex/chip.h b/arch/risc-v/src/litex/chip.h
index 1c40b893a5d80..ce0fcd12cd5ba 100644
--- a/arch/risc-v/src/litex/chip.h
+++ b/arch/risc-v/src/litex/chip.h
@@ -40,7 +40,8 @@
  * Name: setintstack
  *
  * Description:
- *   Set the current stack pointer to the  "top" the correct interrupt stack.
+ *   Set the current stack pointer to the "top" of the correct interrupt
+ *   stack.
  *
  ****************************************************************************/
 
diff --git a/arch/risc-v/src/mpfs/chip.h b/arch/risc-v/src/mpfs/chip.h
index d0cb2308d004a..77243686d0c7c 100644
--- a/arch/risc-v/src/mpfs/chip.h
+++ b/arch/risc-v/src/mpfs/chip.h
@@ -44,8 +44,8 @@
  * Name: setintstack
  *
  * Description:
- *   Set the current stack pointer to the  "top" the correct interrupt stack
- *   for the current CPU.
+ *   Set the current stack pointer to the "top" of the correct interrupt
+ *   stack for the current CPU.
  *
  ****************************************************************************/
 
diff --git a/arch/risc-v/src/mpfs/mpfs_allocateheap.c b/arch/risc-v/src/mpfs/mpfs_allocateheap.c
index 17bb12553bbc9..4c1fb3b983b9e 100644
--- a/arch/risc-v/src/mpfs/mpfs_allocateheap.c
+++ b/arch/risc-v/src/mpfs/mpfs_allocateheap.c
@@ -75,8 +75,8 @@
  *   IDLE thread stack.  Size determined by CONFIG_IDLETHREAD_STACKSIZE.
  *   Heap.  Extends to the end of User SRAM.
  *
- *   The following memory map is assumed for the protect build.
- *   The kernel and user space have it's own dedicated heap space.
+ *   The following memory map is assumed for the protected build.
+ *   The kernel and user space have their own dedicated heap spaces.
  *
  *   User .data region         Size determined at link time
  *   User .bss region          Size determined at link time
diff --git a/arch/risc-v/src/qemu-rv/chip.h b/arch/risc-v/src/qemu-rv/chip.h
index b47e3544352f3..a51478dc4feb7 100644
--- a/arch/risc-v/src/qemu-rv/chip.h
+++ b/arch/risc-v/src/qemu-rv/chip.h
@@ -51,8 +51,8 @@
  * Name: setintstack
  *
  * Description:
- *   Set the current stack pointer to the  "top" the correct interrupt stack
- *   for the current CPU.
+ *   Set the current stack pointer to the "top" of the correct interrupt
+ *   stack for the current CPU.
  *
  ****************************************************************************/
 
diff --git a/arch/risc-v/src/qemu-rv/qemu_rv_allocateheap.c b/arch/risc-v/src/qemu-rv/qemu_rv_allocateheap.c
index 9137aadeaec9b..00a8d71e55f62 100644
--- a/arch/risc-v/src/qemu-rv/qemu_rv_allocateheap.c
+++ b/arch/risc-v/src/qemu-rv/qemu_rv_allocateheap.c
@@ -75,8 +75,8 @@
  *   IDLE thread stack.  Size determined by CONFIG_IDLETHREAD_STACKSIZE.
  *   Heap.  Extends to the end of User SRAM.
  *
- *   The following memory map is assumed for the protect build.
- *   The kernel and user space have it's own dedicated heap space.
+ *   The following memory map is assumed for the protected build.
+ *   The kernel and user space have their own dedicated heap spaces.
  *
  *   User .data region         Size determined at link time
  *   User .bss region          Size determined at link time
diff --git a/arch/risc-v/src/qemu-rv/qemu_rv_start.c b/arch/risc-v/src/qemu-rv/qemu_rv_start.c
index d6e8b7d6a56a0..0128ba1d1b27b 100644
--- a/arch/risc-v/src/qemu-rv/qemu_rv_start.c
+++ b/arch/risc-v/src/qemu-rv/qemu_rv_start.c
@@ -197,7 +197,7 @@ void qemu_rv_start(int mhartid, const char *dtb)
 
   showprogress('B');
 
-  /* Do board initialization */
+  /* TODO: Additional initialization */
 
   showprogress('C');
 
diff --git a/arch/risc-v/src/sg2000/chip.h b/arch/risc-v/src/sg2000/chip.h
index 1a66eb3ac3b4c..fa1acaf8aad24 100644
--- a/arch/risc-v/src/sg2000/chip.h
+++ b/arch/risc-v/src/sg2000/chip.h
@@ -49,8 +49,8 @@
  * Name: setintstack
  *
  * Description:
- *   Set the current stack pointer to the  "top" the correct interrupt stack
- *   for the current CPU.
+ *   Set the current stack pointer to the "top" of the correct interrupt
+ *   stack for the current CPU.
  *
  ****************************************************************************/
 
diff --git a/arch/risc-v/src/sg2000/sg2000_allocateheap.c b/arch/risc-v/src/sg2000/sg2000_allocateheap.c
index 1b04e0c2ca1d3..886cf478f3cbb 100644
--- a/arch/risc-v/src/sg2000/sg2000_allocateheap.c
+++ b/arch/risc-v/src/sg2000/sg2000_allocateheap.c
@@ -65,8 +65,8 @@
  *   IDLE thread stack.  Size determined by CONFIG_IDLETHREAD_STACKSIZE.
  *   Heap.  Extends to the end of User SRAM.
  *
- *   The following memory map is assumed for the protect build.
- *   The kernel and user space have it's own dedicated heap space.
+ *   The following memory map is assumed for the protected build.
+ *   The kernel and user space have their own dedicated heap spaces.
  *
  *   User .data region         Size determined at link time
  *   User .bss region          Size determined at link time
diff --git a/arch/risc-v/src/sg2000/sg2000_start.c b/arch/risc-v/src/sg2000/sg2000_start.c
index 95e2d0526fe34..2ecb844e403e1 100644
--- a/arch/risc-v/src/sg2000/sg2000_start.c
+++ b/arch/risc-v/src/sg2000/sg2000_start.c
@@ -223,7 +223,7 @@ void sg2000_start_s(int mhartid)
 
   showprogress('B');
 
-  /* Do board initialization */
+  /* TODO: Additional initialization */
 
   showprogress('C');