diff --git a/compiled_starters/c/src/main.c b/compiled_starters/c/src/main.c
index 8226332..8689fe0 100644
--- a/compiled_starters/c/src/main.c
+++ b/compiled_starters/c/src/main.c
@@ -26,7 +26,7 @@ int main(int argc, char *argv[]) {
         // You can use print statements as follows for debugging, they'll be visible when running tests.
         fprintf(stderr, "Logs from your program will appear here!\n");
 
-        // Uncomment this to pass the first stage
+        // TODO: Uncomment the code below to pass the first stage
         // printf("database page size: %u\n", page_size);
 
         fclose(database_file);
diff --git a/compiled_starters/clojure/src/sqlite/core.clj b/compiled_starters/clojure/src/sqlite/core.clj
index 3bd676f..60bb3ea 100644
--- a/compiled_starters/clojure/src/sqlite/core.clj
+++ b/compiled_starters/clojure/src/sqlite/core.clj
@@ -19,7 +19,7 @@
 ;; You can use print statements as follows for debugging, they'll be
 ;; visible when running tests.
   (println "Logs from your program will appear here!")
-;; Uncomment this block to pass the first stage
+;; TODO: Uncomment the code below to pass the first stage
 ;; (let [command (second args)]
 ;;   (case command
 ;;     ".dbinfo"
diff --git a/compiled_starters/cpp/src/main.cpp b/compiled_starters/cpp/src/main.cpp
index c99e2b6..6efa950 100644
--- a/compiled_starters/cpp/src/main.cpp
+++ b/compiled_starters/cpp/src/main.cpp
@@ -25,7 +25,7 @@ int main(int argc, char* argv[]) {
             return 1;
         }
 
-        // Uncomment this to pass the first stage
+        // TODO: Uncomment the code below to pass the first stage
         // database_file.seekg(16);  // Skip the first 16 bytes of the header
         // 
         // char buffer[2];
diff --git a/compiled_starters/csharp/src/Program.cs b/compiled_starters/csharp/src/Program.cs
index aa4b115..f07f96a 100644
--- a/compiled_starters/csharp/src/Program.cs
+++ b/compiled_starters/csharp/src/Program.cs
@@ -16,7 +16,7 @@
     // You can use print statements as follows for debugging, they'll be visible when running tests.
     Console.Error.WriteLine("Logs from your program will appear here!");
 
-    // Uncomment this line to pass the first stage
+    // TODO: Uncomment the code below to pass the first stage
     // databaseFile.Seek(16, SeekOrigin.Begin); // Skip the first 16 bytes
     // byte[] pageSizeBytes = new byte[2];
     // databaseFile.Read(pageSizeBytes, 0, 2);
diff --git a/compiled_starters/elixir/lib/main.ex b/compiled_starters/elixir/lib/main.ex
index 928e4de..9d9c40f 100644
--- a/compiled_starters/elixir/lib/main.ex
+++ b/compiled_starters/elixir/lib/main.ex
@@ -9,7 +9,7 @@ defmodule CLI do
             # You can use print statements as follows for debugging, they'll be visible when running tests.
             IO.puts(:stderr, "Logs from your program will appear here!")
             
-            # Uncomment this to pass the first stage
+            # TODO: Uncomment the code below to pass the first stage
             # :file.position(file, 16) # Skip the first 16 bytes of the header
             # <<page_size::16>> = IO.binread(file, 2)
             # IO.puts("database page size: #{page_size}")
diff --git a/compiled_starters/gleam/src/main.gleam b/compiled_starters/gleam/src/main.gleam
index 918aff0..b485883 100644
--- a/compiled_starters/gleam/src/main.gleam
+++ b/compiled_starters/gleam/src/main.gleam
@@ -9,7 +9,7 @@ pub fn main() {
 
   let args = argv.load().arguments
 
-  // Uncomment this to pass the first stage
+  // TODO: Uncomment the code below to pass the first stage
   // case args {
   //   [database_file_path, ".dbinfo", ..] -> {
   //     let assert Ok(rs) = read_stream.open(database_file_path)
diff --git a/compiled_starters/go/app/main.go b/compiled_starters/go/app/main.go
index 8ef3bc7..0e26c89 100644
--- a/compiled_starters/go/app/main.go
+++ b/compiled_starters/go/app/main.go
@@ -37,7 +37,7 @@ func main() {
 		// You can use print statements as follows for debugging, they'll be visible when running tests.
 		fmt.Fprintln(os.Stderr, "Logs from your program will appear here!")
 
-		// Uncomment this to pass the first stage
+		// TODO: Uncomment the code below to pass the first stage
 		// fmt.Printf("database page size: %v", pageSize)
 	default:
 		fmt.Println("Unknown command", command)
diff --git a/compiled_starters/java/src/main/java/Main.java b/compiled_starters/java/src/main/java/Main.java
index 7461574..076816f 100644
--- a/compiled_starters/java/src/main/java/Main.java
+++ b/compiled_starters/java/src/main/java/Main.java
@@ -27,7 +27,7 @@ public static void main(String[] args){
           // You can use print statements as follows for debugging, they'll be visible when running tests.
           System.err.println("Logs from your program will appear here!");
 
-          // Uncomment this block to pass the first stage
+          // TODO: Uncomment the code below to pass the first stage
           // System.out.println("database page size: " + pageSize);
         } catch (IOException e) {
           System.out.println("Error reading file: " + e.getMessage());
diff --git a/compiled_starters/javascript/app/main.js b/compiled_starters/javascript/app/main.js
index ce0f543..53f29bc 100644
--- a/compiled_starters/javascript/app/main.js
+++ b/compiled_starters/javascript/app/main.js
@@ -15,7 +15,7 @@ if (command === ".dbinfo") {
   // You can use print statements as follows for debugging, they'll be visible when running tests.
   console.error("Logs from your program will appear here!");
 
-  // Uncomment this to pass the first stage
+  // TODO: Uncomment the code below to pass the first stage
   // const pageSize = buffer.readUInt16BE(16); // page size is 2 bytes starting at offset 16
   // console.log(`database page size: ${pageSize}`);
 } else {
diff --git a/compiled_starters/kotlin/app/src/main/kotlin/App.kt b/compiled_starters/kotlin/app/src/main/kotlin/App.kt
index da360a8..eadd66c 100644
--- a/compiled_starters/kotlin/app/src/main/kotlin/App.kt
+++ b/compiled_starters/kotlin/app/src/main/kotlin/App.kt
@@ -16,7 +16,7 @@ fun main(args: Array<String>) {
     if (command == ".dbinfo") {
         val databaseFile = java.io.File(databaseFilePath).inputStream()
 
-        // Uncomment this block to pass the first stage
+        // TODO: Uncomment the code below to pass the first stage
         //
         // databaseFile.skip(16) // Skip the first 16 bytes of the header
         // val pageSizeBytes = ByteArray(2) // The following 2 bytes are the page size
diff --git a/compiled_starters/python/app/main.py b/compiled_starters/python/app/main.py
index e90f710..86387bd 100644
--- a/compiled_starters/python/app/main.py
+++ b/compiled_starters/python/app/main.py
@@ -12,7 +12,7 @@
         # You can use print statements as follows for debugging, they'll be visible when running tests.
         print("Logs from your program will appear here!", file=sys.stderr)
 
-        # Uncomment this to pass the first stage
+        # TODO: Uncomment the code below to pass the first stage
         # database_file.seek(16)  # Skip the first 16 bytes of the header
         # page_size = int.from_bytes(database_file.read(2), byteorder="big")
         # print(f"database page size: {page_size}")
diff --git a/compiled_starters/ruby/app/main.rb b/compiled_starters/ruby/app/main.rb
index 15bbde9..c85f24d 100755
--- a/compiled_starters/ruby/app/main.rb
+++ b/compiled_starters/ruby/app/main.rb
@@ -6,7 +6,7 @@
     # You can use print statements as follows for debugging, they'll be visible when running tests.
     $stderr.puts "Logs from your program will appear here"
 
-    # Uncomment this to pass the first stage
+    # TODO: Uncomment the code below to pass the first stage
     # database_file.seek(16)  # Skip the first 16 bytes of the header
     # page_size = database_file.read(2).unpack("n")[0]
     # puts "database page size: #{page_size}"
diff --git a/compiled_starters/rust/src/main.rs b/compiled_starters/rust/src/main.rs
index b5c8a3d..6faa32d 100644
--- a/compiled_starters/rust/src/main.rs
+++ b/compiled_starters/rust/src/main.rs
@@ -26,7 +26,7 @@ fn main() -> Result<()> {
             // You can use print statements as follows for debugging, they'll be visible when running tests.
             eprintln!("Logs from your program will appear here!");
 
-            // Uncomment this block to pass the first stage
+            // TODO: Uncomment the code below to pass the first stage
             // println!("database page size: {}", page_size);
         }
         _ => bail!("Missing or invalid command passed: {}", command),
diff --git a/compiled_starters/swift/Sources/swift-sqlite-challenge/Main.swift b/compiled_starters/swift/Sources/swift-sqlite-challenge/Main.swift
index fdfb541..2518b6f 100644
--- a/compiled_starters/swift/Sources/swift-sqlite-challenge/Main.swift
+++ b/compiled_starters/swift/Sources/swift-sqlite-challenge/Main.swift
@@ -21,7 +21,7 @@ struct Main {
             // You can use print statements as follows for debugging, they'll be visible when running tests.
             eprintln("Logs from your program will appear here!")
 
-            // Uncomment this block to pass the first stage
+            // TODO: Uncomment the code below to pass the first stage
             // let pageSize = UInt16(database[16..<18])
             // print("database page size: \(pageSize)")
         default:
diff --git a/compiled_starters/typescript/app/main.ts b/compiled_starters/typescript/app/main.ts
index 44bdd12..a94831f 100644
--- a/compiled_starters/typescript/app/main.ts
+++ b/compiled_starters/typescript/app/main.ts
@@ -13,7 +13,7 @@ if (command === ".dbinfo") {
     // You can use print statements as follows for debugging, they'll be visible when running tests.
     console.error("Logs from your program will appear here!");
 
-    // Uncomment this to pass the first stage    
+    // TODO: Uncomment the code below to pass the first stage    
     // const pageSize = new DataView(buffer.buffer, 0, buffer.byteLength).getUint16(16);
     // console.log(`database page size: ${pageSize}`);
 
diff --git a/compiled_starters/zig/src/main.zig b/compiled_starters/zig/src/main.zig
index 29f0041..eb8124b 100755
--- a/compiled_starters/zig/src/main.zig
+++ b/compiled_starters/zig/src/main.zig
@@ -26,7 +26,7 @@ pub fn main() !void {
         // You can use print statements as follows for debugging, they'll be visible when running tests.
         std.debug.print("Logs from your program will appear here!\n", .{});
 
-        // Uncomment this block to pass the first stage
+        // TODO: Uncomment the code below to pass the first stage
         // var buf: [2]u8 = undefined;
         // _ = try file.seekTo(16);
         // _ = try file.read(&buf);
diff --git a/solutions/c/01-dr6/diff/src/main.c.diff b/solutions/c/01-dr6/diff/src/main.c.diff
index c980ca1..4bd5252 100644
--- a/solutions/c/01-dr6/diff/src/main.c.diff
+++ b/solutions/c/01-dr6/diff/src/main.c.diff
@@ -27,7 +27,7 @@
 -        // You can use print statements as follows for debugging, they'll be visible when running tests.
 -        fprintf(stderr, "Logs from your program will appear here!\n");
 -
--        // Uncomment this to pass the first stage
+-        // TODO: Uncomment the code below to pass the first stage
 -        // printf("database page size: %u\n", page_size);
 +        printf("database page size: %u\n", page_size);
 
diff --git a/solutions/clojure/01-dr6/diff/src/sqlite/core.clj.diff b/solutions/clojure/01-dr6/diff/src/sqlite/core.clj.diff
index 0a145c1..85a06c2 100644
--- a/solutions/clojure/01-dr6/diff/src/sqlite/core.clj.diff
+++ b/solutions/clojure/01-dr6/diff/src/sqlite/core.clj.diff
@@ -20,7 +20,7 @@
 -;; You can use print statements as follows for debugging, they'll be
 -;; visible when running tests.
    (println "Logs from your program will appear here!")
--;; Uncomment this block to pass the first stage
+-;; TODO: Uncomment the code below to pass the first stage
 -;; (let [command (second args)]
 -;;   (case command
 -;;     ".dbinfo"
diff --git a/solutions/cpp/01-dr6/diff/src/main.cpp.diff b/solutions/cpp/01-dr6/diff/src/main.cpp.diff
index ada5b04..d158deb 100644
--- a/solutions/cpp/01-dr6/diff/src/main.cpp.diff
+++ b/solutions/cpp/01-dr6/diff/src/main.cpp.diff
@@ -26,7 +26,7 @@
              return 1;
          }
 
--        // Uncomment this to pass the first stage
+-        // TODO: Uncomment the code below to pass the first stage
 -        // database_file.seekg(16);  // Skip the first 16 bytes of the header
 -        // 
 -        // char buffer[2];
diff --git a/solutions/csharp/01-dr6/diff/src/Program.cs.diff b/solutions/csharp/01-dr6/diff/src/Program.cs.diff
index ed26ba8..787faab 100644
--- a/solutions/csharp/01-dr6/diff/src/Program.cs.diff
+++ b/solutions/csharp/01-dr6/diff/src/Program.cs.diff
@@ -17,7 +17,7 @@
 -    // You can use print statements as follows for debugging, they'll be visible when running tests.
 -    Console.Error.WriteLine("Logs from your program will appear here!");
 -
--    // Uncomment this line to pass the first stage
+-    // TODO: Uncomment the code below to pass the first stage
 -    // databaseFile.Seek(16, SeekOrigin.Begin); // Skip the first 16 bytes
 -    // byte[] pageSizeBytes = new byte[2];
 -    // databaseFile.Read(pageSizeBytes, 0, 2);
diff --git a/solutions/elixir/01-dr6/diff/lib/main.ex.diff b/solutions/elixir/01-dr6/diff/lib/main.ex.diff
index 99772ee..656986e 100644
--- a/solutions/elixir/01-dr6/diff/lib/main.ex.diff
+++ b/solutions/elixir/01-dr6/diff/lib/main.ex.diff
@@ -10,7 +10,7 @@
 -            # You can use print statements as follows for debugging, they'll be visible when running tests.
 -            IO.puts(:stderr, "Logs from your program will appear here!")
 -            
--            # Uncomment this to pass the first stage
+-            # TODO: Uncomment the code below to pass the first stage
 -            # :file.position(file, 16) # Skip the first 16 bytes of the header
 -            # <<page_size::16>> = IO.binread(file, 2)
 -            # IO.puts("database page size: #{page_size}")
diff --git a/solutions/gleam/01-dr6/diff/src/main.gleam.diff b/solutions/gleam/01-dr6/diff/src/main.gleam.diff
index 3758045..8291b52 100644
--- a/solutions/gleam/01-dr6/diff/src/main.gleam.diff
+++ b/solutions/gleam/01-dr6/diff/src/main.gleam.diff
@@ -10,7 +10,7 @@
 -
    let args = argv.load().arguments
 
--  // Uncomment this to pass the first stage
+-  // TODO: Uncomment the code below to pass the first stage
 -  // case args {
 -  //   [database_file_path, ".dbinfo", ..] -> {
 -  //     let assert Ok(rs) = read_stream.open(database_file_path)
diff --git a/solutions/go/01-dr6/diff/app/main.go.diff b/solutions/go/01-dr6/diff/app/main.go.diff
index f535b24..c67eef9 100644
--- a/solutions/go/01-dr6/diff/app/main.go.diff
+++ b/solutions/go/01-dr6/diff/app/main.go.diff
@@ -27,7 +27,7 @@
 -		// You can use print statements as follows for debugging, they'll be visible when running tests.
 -		fmt.Fprintln(os.Stderr, "Logs from your program will appear here!")
 -
--		// Uncomment this to pass the first stage
+-		// TODO: Uncomment the code below to pass the first stage
 -		// fmt.Printf("database page size: %v", pageSize)
 +		fmt.Printf("database page size: %v", pageSize)
  	default:
diff --git a/solutions/java/01-dr6/diff/src/main/java/Main.java.diff b/solutions/java/01-dr6/diff/src/main/java/Main.java.diff
index 737356e..6826f42 100644
--- a/solutions/java/01-dr6/diff/src/main/java/Main.java.diff
+++ b/solutions/java/01-dr6/diff/src/main/java/Main.java.diff
@@ -27,7 +27,7 @@
 -          // You can use print statements as follows for debugging, they'll be visible when running tests.
 -          System.err.println("Logs from your program will appear here!");
 -
--          // Uncomment this block to pass the first stage
+-          // TODO: Uncomment the code below to pass the first stage
 -          // System.out.println("database page size: " + pageSize);
 +          System.out.println("database page size: " + pageSize);
          } catch (IOException e) {
diff --git a/solutions/javascript/01-dr6/diff/app/main.js.diff b/solutions/javascript/01-dr6/diff/app/main.js.diff
index baf878f..72ab88d 100644
--- a/solutions/javascript/01-dr6/diff/app/main.js.diff
+++ b/solutions/javascript/01-dr6/diff/app/main.js.diff
@@ -16,7 +16,7 @@
 -  // You can use print statements as follows for debugging, they'll be visible when running tests.
 -  console.error("Logs from your program will appear here!");
 -
--  // Uncomment this to pass the first stage
+-  // TODO: Uncomment the code below to pass the first stage
 -  // const pageSize = buffer.readUInt16BE(16); // page size is 2 bytes starting at offset 16
 -  // console.log(`database page size: ${pageSize}`);
 +  const pageSize = buffer.readUInt16BE(16); // page size is 2 bytes starting at offset 16
diff --git a/solutions/kotlin/01-dr6/diff/app/src/main/kotlin/App.kt.diff b/solutions/kotlin/01-dr6/diff/app/src/main/kotlin/App.kt.diff
index 3a2f236..6226151 100644
--- a/solutions/kotlin/01-dr6/diff/app/src/main/kotlin/App.kt.diff
+++ b/solutions/kotlin/01-dr6/diff/app/src/main/kotlin/App.kt.diff
@@ -17,7 +17,7 @@
      if (command == ".dbinfo") {
          val databaseFile = java.io.File(databaseFilePath).inputStream()
 
--        // Uncomment this block to pass the first stage
+-        // TODO: Uncomment the code below to pass the first stage
 -        //
 -        // databaseFile.skip(16) // Skip the first 16 bytes of the header
 -        // val pageSizeBytes = ByteArray(2) // The following 2 bytes are the page size
diff --git a/solutions/python/01-dr6/diff/app/main.py.diff b/solutions/python/01-dr6/diff/app/main.py.diff
index 4b2bff2..ad6d27d 100644
--- a/solutions/python/01-dr6/diff/app/main.py.diff
+++ b/solutions/python/01-dr6/diff/app/main.py.diff
@@ -13,7 +13,7 @@
 -        # You can use print statements as follows for debugging, they'll be visible when running tests.
 -        print("Logs from your program will appear here!", file=sys.stderr)
 -
--        # Uncomment this to pass the first stage
+-        # TODO: Uncomment the code below to pass the first stage
 -        # database_file.seek(16)  # Skip the first 16 bytes of the header
 -        # page_size = int.from_bytes(database_file.read(2), byteorder="big")
 -        # print(f"database page size: {page_size}")
diff --git a/solutions/ruby/01-dr6/diff/app/main.rb.diff b/solutions/ruby/01-dr6/diff/app/main.rb.diff
index 29d655b..e17660c 100644
--- a/solutions/ruby/01-dr6/diff/app/main.rb.diff
+++ b/solutions/ruby/01-dr6/diff/app/main.rb.diff
@@ -7,7 +7,7 @@
 -    # You can use print statements as follows for debugging, they'll be visible when running tests.
 -    $stderr.puts "Logs from your program will appear here"
 -
--    # Uncomment this to pass the first stage
+-    # TODO: Uncomment the code below to pass the first stage
 -    # database_file.seek(16)  # Skip the first 16 bytes of the header
 -    # page_size = database_file.read(2).unpack("n")[0]
 -    # puts "database page size: #{page_size}"
diff --git a/solutions/rust/01-dr6/diff/src/main.rs.diff b/solutions/rust/01-dr6/diff/src/main.rs.diff
index 12e1d6f..fc99315 100644
--- a/solutions/rust/01-dr6/diff/src/main.rs.diff
+++ b/solutions/rust/01-dr6/diff/src/main.rs.diff
@@ -27,7 +27,7 @@
 -            // You can use print statements as follows for debugging, they'll be visible when running tests.
 -            eprintln!("Logs from your program will appear here!");
 -
--            // Uncomment this block to pass the first stage
+-            // TODO: Uncomment the code below to pass the first stage
 -            // println!("database page size: {}", page_size);
 +            println!("database page size: {}", page_size);
          }
diff --git a/solutions/swift/01-dr6/diff/Sources/swift-sqlite-challenge/Main.swift.diff b/solutions/swift/01-dr6/diff/Sources/swift-sqlite-challenge/Main.swift.diff
index 50617a7..62ab639 100644
--- a/solutions/swift/01-dr6/diff/Sources/swift-sqlite-challenge/Main.swift.diff
+++ b/solutions/swift/01-dr6/diff/Sources/swift-sqlite-challenge/Main.swift.diff
@@ -22,7 +22,7 @@
 -            // You can use print statements as follows for debugging, they'll be visible when running tests.
 -            eprintln("Logs from your program will appear here!")
 -
--            // Uncomment this block to pass the first stage
+-            // TODO: Uncomment the code below to pass the first stage
 -            // let pageSize = UInt16(database[16..<18])
 -            // print("database page size: \(pageSize)")
 +            let pageSize = UInt16(database[16..<18])
diff --git a/solutions/typescript/01-dr6/diff/app/main.ts.diff b/solutions/typescript/01-dr6/diff/app/main.ts.diff
index e6721c0..0957fb7 100644
--- a/solutions/typescript/01-dr6/diff/app/main.ts.diff
+++ b/solutions/typescript/01-dr6/diff/app/main.ts.diff
@@ -14,7 +14,7 @@
 -    // You can use print statements as follows for debugging, they'll be visible when running tests.
 -    console.error("Logs from your program will appear here!");
 -
--    // Uncomment this to pass the first stage    
+-    // TODO: Uncomment the code below to pass the first stage    
 -    // const pageSize = new DataView(buffer.buffer, 0, buffer.byteLength).getUint16(16);
 -    // console.log(`database page size: ${pageSize}`);
 +    const pageSize = new DataView(buffer.buffer, 0, buffer.byteLength).getUint16(16);
diff --git a/solutions/zig/01-dr6/diff/src/main.zig.diff b/solutions/zig/01-dr6/diff/src/main.zig.diff
index da3a8fe..c485987 100644
--- a/solutions/zig/01-dr6/diff/src/main.zig.diff
+++ b/solutions/zig/01-dr6/diff/src/main.zig.diff
@@ -27,7 +27,7 @@
 -        // You can use print statements as follows for debugging, they'll be visible when running tests.
 -        std.debug.print("Logs from your program will appear here!\n", .{});
 -
--        // Uncomment this block to pass the first stage
+-        // TODO: Uncomment the code below to pass the first stage
 -        // var buf: [2]u8 = undefined;
 -        // _ = try file.seekTo(16);
 -        // _ = try file.read(&buf);
diff --git a/starter_templates/c/code/src/main.c b/starter_templates/c/code/src/main.c
index 8226332..8689fe0 100644
--- a/starter_templates/c/code/src/main.c
+++ b/starter_templates/c/code/src/main.c
@@ -26,7 +26,7 @@ int main(int argc, char *argv[]) {
         // You can use print statements as follows for debugging, they'll be visible when running tests.
         fprintf(stderr, "Logs from your program will appear here!\n");
 
-        // Uncomment this to pass the first stage
+        // TODO: Uncomment the code below to pass the first stage
         // printf("database page size: %u\n", page_size);
 
         fclose(database_file);
diff --git a/starter_templates/clojure/code/src/sqlite/core.clj b/starter_templates/clojure/code/src/sqlite/core.clj
index 3bd676f..60bb3ea 100644
--- a/starter_templates/clojure/code/src/sqlite/core.clj
+++ b/starter_templates/clojure/code/src/sqlite/core.clj
@@ -19,7 +19,7 @@
 ;; You can use print statements as follows for debugging, they'll be
 ;; visible when running tests.
   (println "Logs from your program will appear here!")
-;; Uncomment this block to pass the first stage
+;; TODO: Uncomment the code below to pass the first stage
 ;; (let [command (second args)]
 ;;   (case command
 ;;     ".dbinfo"
diff --git a/starter_templates/cpp/code/src/main.cpp b/starter_templates/cpp/code/src/main.cpp
index c99e2b6..6efa950 100644
--- a/starter_templates/cpp/code/src/main.cpp
+++ b/starter_templates/cpp/code/src/main.cpp
@@ -25,7 +25,7 @@ int main(int argc, char* argv[]) {
             return 1;
         }
 
-        // Uncomment this to pass the first stage
+        // TODO: Uncomment the code below to pass the first stage
         // database_file.seekg(16);  // Skip the first 16 bytes of the header
         // 
         // char buffer[2];
diff --git a/starter_templates/csharp/code/src/Program.cs b/starter_templates/csharp/code/src/Program.cs
index aa4b115..f07f96a 100644
--- a/starter_templates/csharp/code/src/Program.cs
+++ b/starter_templates/csharp/code/src/Program.cs
@@ -16,7 +16,7 @@
     // You can use print statements as follows for debugging, they'll be visible when running tests.
     Console.Error.WriteLine("Logs from your program will appear here!");
 
-    // Uncomment this line to pass the first stage
+    // TODO: Uncomment the code below to pass the first stage
     // databaseFile.Seek(16, SeekOrigin.Begin); // Skip the first 16 bytes
     // byte[] pageSizeBytes = new byte[2];
     // databaseFile.Read(pageSizeBytes, 0, 2);
diff --git a/starter_templates/elixir/code/lib/main.ex b/starter_templates/elixir/code/lib/main.ex
index 928e4de..9d9c40f 100644
--- a/starter_templates/elixir/code/lib/main.ex
+++ b/starter_templates/elixir/code/lib/main.ex
@@ -9,7 +9,7 @@ defmodule CLI do
             # You can use print statements as follows for debugging, they'll be visible when running tests.
             IO.puts(:stderr, "Logs from your program will appear here!")
             
-            # Uncomment this to pass the first stage
+            # TODO: Uncomment the code below to pass the first stage
             # :file.position(file, 16) # Skip the first 16 bytes of the header
             # <<page_size::16>> = IO.binread(file, 2)
             # IO.puts("database page size: #{page_size}")
diff --git a/starter_templates/gleam/code/src/main.gleam b/starter_templates/gleam/code/src/main.gleam
index 918aff0..b485883 100644
--- a/starter_templates/gleam/code/src/main.gleam
+++ b/starter_templates/gleam/code/src/main.gleam
@@ -9,7 +9,7 @@ pub fn main() {
 
   let args = argv.load().arguments
 
-  // Uncomment this to pass the first stage
+  // TODO: Uncomment the code below to pass the first stage
   // case args {
   //   [database_file_path, ".dbinfo", ..] -> {
   //     let assert Ok(rs) = read_stream.open(database_file_path)
diff --git a/starter_templates/go/code/app/main.go b/starter_templates/go/code/app/main.go
index 8ef3bc7..0e26c89 100644
--- a/starter_templates/go/code/app/main.go
+++ b/starter_templates/go/code/app/main.go
@@ -37,7 +37,7 @@ func main() {
 		// You can use print statements as follows for debugging, they'll be visible when running tests.
 		fmt.Fprintln(os.Stderr, "Logs from your program will appear here!")
 
-		// Uncomment this to pass the first stage
+		// TODO: Uncomment the code below to pass the first stage
 		// fmt.Printf("database page size: %v", pageSize)
 	default:
 		fmt.Println("Unknown command", command)
diff --git a/starter_templates/java/code/src/main/java/Main.java b/starter_templates/java/code/src/main/java/Main.java
index 7461574..076816f 100644
--- a/starter_templates/java/code/src/main/java/Main.java
+++ b/starter_templates/java/code/src/main/java/Main.java
@@ -27,7 +27,7 @@ public static void main(String[] args){
           // You can use print statements as follows for debugging, they'll be visible when running tests.
           System.err.println("Logs from your program will appear here!");
 
-          // Uncomment this block to pass the first stage
+          // TODO: Uncomment the code below to pass the first stage
           // System.out.println("database page size: " + pageSize);
         } catch (IOException e) {
           System.out.println("Error reading file: " + e.getMessage());
diff --git a/starter_templates/javascript/code/app/main.js b/starter_templates/javascript/code/app/main.js
index ce0f543..53f29bc 100644
--- a/starter_templates/javascript/code/app/main.js
+++ b/starter_templates/javascript/code/app/main.js
@@ -15,7 +15,7 @@ if (command === ".dbinfo") {
   // You can use print statements as follows for debugging, they'll be visible when running tests.
   console.error("Logs from your program will appear here!");
 
-  // Uncomment this to pass the first stage
+  // TODO: Uncomment the code below to pass the first stage
   // const pageSize = buffer.readUInt16BE(16); // page size is 2 bytes starting at offset 16
   // console.log(`database page size: ${pageSize}`);
 } else {
diff --git a/starter_templates/kotlin/code/app/src/main/kotlin/App.kt b/starter_templates/kotlin/code/app/src/main/kotlin/App.kt
index da360a8..eadd66c 100644
--- a/starter_templates/kotlin/code/app/src/main/kotlin/App.kt
+++ b/starter_templates/kotlin/code/app/src/main/kotlin/App.kt
@@ -16,7 +16,7 @@ fun main(args: Array<String>) {
     if (command == ".dbinfo") {
         val databaseFile = java.io.File(databaseFilePath).inputStream()
 
-        // Uncomment this block to pass the first stage
+        // TODO: Uncomment the code below to pass the first stage
         //
         // databaseFile.skip(16) // Skip the first 16 bytes of the header
         // val pageSizeBytes = ByteArray(2) // The following 2 bytes are the page size
diff --git a/starter_templates/python/code/app/main.py b/starter_templates/python/code/app/main.py
index e90f710..86387bd 100644
--- a/starter_templates/python/code/app/main.py
+++ b/starter_templates/python/code/app/main.py
@@ -12,7 +12,7 @@
         # You can use print statements as follows for debugging, they'll be visible when running tests.
         print("Logs from your program will appear here!", file=sys.stderr)
 
-        # Uncomment this to pass the first stage
+        # TODO: Uncomment the code below to pass the first stage
         # database_file.seek(16)  # Skip the first 16 bytes of the header
         # page_size = int.from_bytes(database_file.read(2), byteorder="big")
         # print(f"database page size: {page_size}")
diff --git a/starter_templates/ruby/code/app/main.rb b/starter_templates/ruby/code/app/main.rb
index 15bbde9..c85f24d 100755
--- a/starter_templates/ruby/code/app/main.rb
+++ b/starter_templates/ruby/code/app/main.rb
@@ -6,7 +6,7 @@
     # You can use print statements as follows for debugging, they'll be visible when running tests.
     $stderr.puts "Logs from your program will appear here"
 
-    # Uncomment this to pass the first stage
+    # TODO: Uncomment the code below to pass the first stage
     # database_file.seek(16)  # Skip the first 16 bytes of the header
     # page_size = database_file.read(2).unpack("n")[0]
     # puts "database page size: #{page_size}"
diff --git a/starter_templates/rust/code/src/main.rs b/starter_templates/rust/code/src/main.rs
index b5c8a3d..6faa32d 100644
--- a/starter_templates/rust/code/src/main.rs
+++ b/starter_templates/rust/code/src/main.rs
@@ -26,7 +26,7 @@ fn main() -> Result<()> {
             // You can use print statements as follows for debugging, they'll be visible when running tests.
             eprintln!("Logs from your program will appear here!");
 
-            // Uncomment this block to pass the first stage
+            // TODO: Uncomment the code below to pass the first stage
             // println!("database page size: {}", page_size);
         }
         _ => bail!("Missing or invalid command passed: {}", command),
diff --git a/starter_templates/swift/code/Sources/swift-sqlite-challenge/Main.swift b/starter_templates/swift/code/Sources/swift-sqlite-challenge/Main.swift
index fdfb541..2518b6f 100644
--- a/starter_templates/swift/code/Sources/swift-sqlite-challenge/Main.swift
+++ b/starter_templates/swift/code/Sources/swift-sqlite-challenge/Main.swift
@@ -21,7 +21,7 @@ struct Main {
             // You can use print statements as follows for debugging, they'll be visible when running tests.
             eprintln("Logs from your program will appear here!")
 
-            // Uncomment this block to pass the first stage
+            // TODO: Uncomment the code below to pass the first stage
             // let pageSize = UInt16(database[16..<18])
             // print("database page size: \(pageSize)")
         default:
diff --git a/starter_templates/typescript/code/app/main.ts b/starter_templates/typescript/code/app/main.ts
index 44bdd12..a94831f 100644
--- a/starter_templates/typescript/code/app/main.ts
+++ b/starter_templates/typescript/code/app/main.ts
@@ -13,7 +13,7 @@ if (command === ".dbinfo") {
     // You can use print statements as follows for debugging, they'll be visible when running tests.
     console.error("Logs from your program will appear here!");
 
-    // Uncomment this to pass the first stage    
+    // TODO: Uncomment the code below to pass the first stage    
     // const pageSize = new DataView(buffer.buffer, 0, buffer.byteLength).getUint16(16);
     // console.log(`database page size: ${pageSize}`);
 
diff --git a/starter_templates/zig/code/src/main.zig b/starter_templates/zig/code/src/main.zig
index 29f0041..eb8124b 100755
--- a/starter_templates/zig/code/src/main.zig
+++ b/starter_templates/zig/code/src/main.zig
@@ -26,7 +26,7 @@ pub fn main() !void {
         // You can use print statements as follows for debugging, they'll be visible when running tests.
         std.debug.print("Logs from your program will appear here!\n", .{});
 
-        // Uncomment this block to pass the first stage
+        // TODO: Uncomment the code below to pass the first stage
         // var buf: [2]u8 = undefined;
         // _ = try file.seekTo(16);
         // _ = try file.read(&buf);