diff --git a/.forgejo/workflows/push-next.yml b/.forgejo/workflows/push-next.yml
index cc8498c..4e17ac9 100644
--- a/.forgejo/workflows/push-next.yml
+++ b/.forgejo/workflows/push-next.yml
@@ -4,16 +4,53 @@ on:
   push:
     branches:
       - next
+  pull_request:
+    branches:
+      - main
   workflow_dispatch:
 
+env:
+  CARGO_TERM_COLOR: always
+
 jobs:
 
-  test:
+  checks:
     runs-on: docker
 
+    strategy:
+      matrix:
+        toolchain:
+          - name: stable
+          - name: nightly
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Check TODOs
-        uses: https://git.kemitix.net/kemitix/forgejo-todo-checker@v1
+        uses: https://git.kemitix.net/kemitix/forgejo-todo-checker@v1.0.0
+
+      - name: Machete
+        uses: https://git.kemitix.net/kemitix/rust@v2.1.0
+        with:
+          args: ${{ matrix.toolchain.name }} cargo machete
+
+      - name: Format
+        uses: https://git.kemitix.net/kemitix/rust@v2.1.0
+        with:
+          args: ${{ matrix.toolchain.name }} cargo fmt --all -- --check
+
+      - name: Clippy
+        uses: https://git.kemitix.net/kemitix/rust@v2.1.0
+        with:
+          args: ${{ matrix.toolchain.name }} cargo hack --feature-powerset clippy
+
+      - name: Build
+        uses: https://git.kemitix.net/kemitix/rust@v2.1.0
+        with:
+          args: ${{ matrix.toolchain.name }} cargo hack --feature-powerset build
+
+      - name: Test
+        uses: https://git.kemitix.net/kemitix/rust@v2.1.0
+        with:
+          args: ${{ matrix.toolchain.name }} cargo hack --feature-powerset test
diff --git a/Cargo.toml b/Cargo.toml
index 4be34f4..a4de932 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,9 +11,7 @@ file-format = { version = "0.25", features = ["reader-txt"] }
 kxio = "1.2"
 regex = "1.10"
 serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
 tokio = { version = "1.37", features = ["full"] }
-ureq = "2.10"
 
 [dev-dependencies]
 assert2 = "0.3"
diff --git a/src/scanner.rs b/src/scanner.rs
index b252ecb..085f53b 100644
--- a/src/scanner.rs
+++ b/src/scanner.rs
@@ -72,12 +72,10 @@ impl FileScanner for DefaultFileScanner {
             .for_each(|marker| match marker {
                 Marker::Invalid(_) => {
                     errors += 1;
-                    // TODO: (#6) Better error message
                     printer.println(marker.to_string());
                 }
                 Marker::Closed(_, _) => {
                     errors += 1;
-                    // TODO: (#6) Better error message
                     printer.println(marker.to_string());
                 }
                 _ => {}