diff --git a/py/objstrunicode.c b/py/objstrunicode.c
index 8be6b5b0d0..563bce9fd2 100644
--- a/py/objstrunicode.c
+++ b/py/objstrunicode.c
@@ -73,7 +73,7 @@ STATIC void uni_print_quoted(const mp_print_t *print, const byte *str_data, uint
             mp_print_str(print, "\\r");
         } else if (ch == '\t') {
             mp_print_str(print, "\\t");
-        // CIRCUITPY-CHANGE: print printable Unicode chars
+            // CIRCUITPY-CHANGE: print printable Unicode chars
         } else if (ch <= 0x1f || (0x7f <= ch && ch <= 0xa0) || ch == 0xad) {
             mp_printf(print, "\\x%02x", ch);
         } else if ((0x2000 <= ch && ch <= 0x200f) || ch == 0x2028 || ch == 0x2029) {
diff --git a/py/runtime.c b/py/runtime.c
index 0f13295a92..a488949e74 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1297,7 +1297,7 @@ void mp_store_attr(mp_obj_t base, qstr attr, mp_obj_t value) {
             // success
             return;
         }
-    // CIRCUITPY-CHANGE: https://github.com/adafruit/circuitpython/pull/50
+        // CIRCUITPY-CHANGE: https://github.com/adafruit/circuitpython/pull/50
     #if MICROPY_PY_BUILTINS_PROPERTY
     } else if (MP_OBJ_TYPE_HAS_SLOT(type, locals_dict)) {
         // generic method lookup
diff --git a/shared/memzip/README.md b/shared/memzip/README.md
index 3938e3198c..9aa12a94c8 100644
--- a/shared/memzip/README.md
+++ b/shared/memzip/README.md
@@ -25,4 +25,3 @@ $(BUILD)/memzip-files.c: $(shell find ${MEMZIP_DIR} -type f)
     @$(ECHO) "Creating $@"
     $(Q)$(PYTHON) $(MAKE_MEMZIP) --zip-file $(BUILD)/memzip-files.zip --c-file $@ $(MEMZIP_DIR)
 ```
-
diff --git a/shared/memzip/lexermemzip.c b/shared/memzip/lexermemzip.c
index 6b26961bdc..c1f21c1caa 100644
--- a/shared/memzip/lexermemzip.c
+++ b/shared/memzip/lexermemzip.c
@@ -16,4 +16,3 @@ mp_lexer_t *mp_lexer_new_from_file(const char *filename)
 
     return mp_lexer_new_from_str_len(qstr_from_str(filename), (const char *)data, (mp_uint_t)len, 0);
 }
-
diff --git a/tests/extmod/asyncio_basic.py b/tests/extmod/asyncio_basic.py
index f716bef26b..bdc4f61333 100644
--- a/tests/extmod/asyncio_basic.py
+++ b/tests/extmod/asyncio_basic.py
@@ -4,6 +4,7 @@ except ImportError:
     print("SKIP")
     raise SystemExit
 
+
 # CIRCUITPY-CHANGE: CircuitPython provides __await__()
 async def foo():
     return 42
diff --git a/tests/import/ext/micropython.py b/tests/import/ext/micropython.py
index 88c8b770e1..251e1e0aa9 100644
--- a/tests/import/ext/micropython.py
+++ b/tests/import/ext/micropython.py
@@ -1,2 +1,2 @@
-# micropython is always builtin and cannot be overriden by the filesystem.
+# micropython is always builtin and cannot be overridden by the filesystem.
 print("ERROR: micropython from filesystem")
diff --git a/tests/import/ext/sys.py b/tests/import/ext/sys.py
index 71ee633e11..a041c407f5 100644
--- a/tests/import/ext/sys.py
+++ b/tests/import/ext/sys.py
@@ -1,2 +1,2 @@
-# sys is always builtin and cannot be overriden by the filesystem.
+# sys is always builtin and cannot be overridden by the filesystem.
 print("ERROR: sys from filesystem")
diff --git a/tests/import/ext/usys.py b/tests/import/ext/usys.py
index d7629a4499..302d1df338 100644
--- a/tests/import/ext/usys.py
+++ b/tests/import/ext/usys.py
@@ -1,3 +1,3 @@
-# usys (and any u-prefix) is always builtin and cannot be overriden by the
+# usys (and any u-prefix) is always builtin and cannot be overridden by the
 # filesystem.
 print("ERROR: usys from filesystem")
diff --git a/tests/run-natmodtests.py b/tests/run-natmodtests.py
index d6ec5fe525..f5e86bffbc 100755
--- a/tests/run-natmodtests.py
+++ b/tests/run-natmodtests.py
@@ -20,7 +20,8 @@ TEST_MAPPINGS = {
     "heapq": "heapq/heapq_$(ARCH).mpy",
     "random": "random/random_$(ARCH).mpy",
     "re": "re/re_$(ARCH).mpy",
-    "zlib": "zlib/zlib_$(ARCH).mpy",}
+    "zlib": "zlib/zlib_$(ARCH).mpy",
+}
 
 # Code to allow a target MicroPython to import an .mpy from RAM
 injected_import_hook_code = """\
diff --git a/tools/merge_micropython.py b/tools/merge_micropython.py
index 74c32bea6b..85fac1f4c5 100644
--- a/tools/merge_micropython.py
+++ b/tools/merge_micropython.py
@@ -42,7 +42,7 @@ ports_to_delete = [
 ]
 for p in ports_to_delete:
     try:
-        git.rm("-rf", "ports/" + p)XC
+        git.rm("-rf", "ports/" + p)
     except sh.ErrorReturnCode_128:
         pass