From 9e1aaf1ab0801dd34bd72d973b62fa6b52066fbb Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Fri, 29 Aug 2025 22:50:11 +0200
Subject: [PATCH 1/3] bandit: exclude scripts/ and contrib/loadtesting/

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 27faf8d01..c18703144 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -149,7 +149,7 @@ unfixable = []
 "src/moin/datastructures/__init__.py" = ["F401"]
 
 [tool.bandit]
-exclude_dirs = ["quickinstall.py", "*/_tests/*", "*/_ui_tests/*"]
+exclude_dirs = ["quickinstall.py", "*/_tests/*", "*/_ui_tests/*", "scripts", "contrib/loadtesting"]
 skips = ["B101", "B105", "B106", "B307", "B311", "B403", "B608"]
 
 # tox configuration - if you change anything here, run this to verify:

From 7eeec13f205c03ee66a83c9a2b579311c406849e Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Fri, 29 Aug 2025 22:45:10 +0200
Subject: [PATCH 2/3] fix typos and grammar

---
 _ui_tests/config.py                           |  2 +-
 _ui_tests/conftest.py                         | 26 +++---
 _ui_tests/driver_register.py                  |  9 +--
 _ui_tests/test_subitems.py                    | 18 ++---
 _ui_tests/utils.py                            | 17 ++--
 contrib/css-lint/lint-prep.py                 | 10 +--
 contrib/loadtesting/locust/locustfile.py      | 40 +++++-----
 contrib/loadtesting/locust/locustfile2.py     | 28 +++----
 .../_pythonanywhere_com_wsgi.py               |  4 +-
 contrib/pythonanywhere/wsgi.py                |  2 +-
 contrib/wikiconfig/wikiconfig_editme.py       |  4 +-
 contrib/wikiconfig/wikiconfig_local.py        |  7 +-
 contrib/wsgi/profiler.py                      | 18 ++---
 contrib/wsgi/proxy.py                         |  6 +-
 docs/conf.py                                  | 16 ++--
 quickinstall.py                               | 42 +++++-----
 scripts/coding_std.py                         | 22 +++---
 scripts/dos2unix.py                           | 12 +--
 scripts/raw_wsgi_bench.py                     |  4 +-
 scripts/wget.py                               |  8 +-
 src/moin/__init__.py                          |  4 +-
 src/moin/_template.py                         | 14 ++--
 src/moin/_tests/__init__.py                   | 35 ++++----
 src/moin/_tests/_test_template.py             | 16 ++--
 src/moin/_tests/ldap_testbase.py              | 79 +++++++++----------
 src/moin/_tests/ldap_testdata.py              |  6 +-
 src/moin/_tests/test_error.py                 | 10 +--
 src/moin/_tests/test_forms.py                 |  4 +-
 src/moin/_tests/test_test_environ.py          |  2 +-
 src/moin/_tests/test_user.py                  | 28 +++----
 src/moin/_tests/test_views.py                 |  2 +-
 src/moin/_tests/test_wikiutil.py              | 26 +++---
 src/moin/_tests/wiki/data/plugin/__init__.py  |  2 +-
 src/moin/_tests/wikiconfig.py                 |  6 +-
 src/moin/app.py                               | 37 +++++----
 src/moin/apps/__init__.py                     | 12 +--
 src/moin/apps/admin/__init__.py               |  4 +-
 src/moin/apps/admin/_tests/test_admin.py      |  2 +-
 src/moin/apps/admin/views.py                  | 18 ++---
 src/moin/apps/feed/__init__.py                |  5 +-
 src/moin/apps/feed/_tests/test_feed.py        |  4 +-
 src/moin/apps/feed/views.py                   | 18 ++---
 src/moin/apps/frontend/__init__.py            |  5 +-
 .../apps/frontend/_tests/test_frontend.py     | 12 +--
 src/moin/apps/frontend/views.py               |  4 +-
 src/moin/apps/misc/__init__.py                |  4 +-
 src/moin/apps/misc/_tests/test_misc.py        |  2 +-
 src/moin/apps/misc/views.py                   | 16 ++--
 src/moin/apps/serve/__init__.py               |  8 +-
 src/moin/apps/serve/_tests/test_serve.py      |  2 +-
 src/moin/apps/serve/views.py                  |  4 +-
 src/moin/auth/__init__.py                     |  4 +-
 src/moin/auth/_tests/test_auth.py             |  2 +-
 src/moin/auth/_tests/test_http.py             |  4 +-
 src/moin/auth/_tests/test_ldap_login.py       | 22 +++---
 src/moin/auth/_tests/test_log.py              |  4 +-
 src/moin/auth/http.py                         | 18 ++---
 src/moin/auth/ldap_login.py                   | 24 +++---
 src/moin/auth/log.py                          |  8 +-
 src/moin/cli/__init__.py                      | 14 ++--
 src/moin/cli/_tests/__init__.py               | 35 ++++----
 src/moin/cli/_tests/conftest.py               | 23 +++---
 src/moin/cli/_tests/default_settings.py       |  9 ++-
 .../cli/_tests/scrapy/moincrawler/items.py    | 29 +++----
 .../cli/_tests/scrapy/moincrawler/settings.py | 21 +++--
 .../scrapy/moincrawler/spiders/__init__.py    |  2 +-
 .../scrapy/moincrawler/spiders/ref_checker.py | 26 +++---
 src/moin/cli/_tests/test_cli.py               |  4 +-
 src/moin/cli/_tests/test_create_instance.py   |  2 +-
 src/moin/cli/_tests/test_index.py             |  2 +-
 src/moin/cli/_tests/test_modify_item.py       | 10 +--
 src/moin/cli/_tests/test_scrapy_crawl.py      | 17 ++--
 src/moin/cli/_tests/test_serialization.py     |  8 +-
 src/moin/cli/_tests/test_set_meta.py          |  2 +-
 src/moin/cli/_util.py                         | 17 ++--
 src/moin/cli/account/__init__.py              |  2 +-
 src/moin/cli/account/create.py                |  6 +-
 src/moin/cli/account/disable.py               |  8 +-
 src/moin/cli/account/resetpw.py               | 36 ++++-----
 src/moin/cli/maint/__init__.py                |  2 +-
 src/moin/cli/maint/create_instance.py         | 26 +++---
 src/moin/cli/maint/dump_html.py               | 34 ++++----
 src/moin/cli/maint/index.py                   | 25 +++---
 src/moin/cli/maint/modify_item.py             | 24 +++---
 src/moin/cli/maint/reduce_revisions.py        |  8 +-
 src/moin/cli/maint/serialization.py           | 18 ++---
 src/moin/cli/maint/set_meta.py                | 14 ++--
 src/moin/cli/migration/__init__.py            |  2 +-
 src/moin/cli/migration/moin19/__init__.py     |  2 +-
 src/moin/cli/migration/moin19/_logfile19.py   | 21 +++--
 src/moin/cli/migration/moin19/_utils19.py     | 32 ++++----
 src/moin/cli/migration/moin19/import19.py     | 40 +++++-----
 .../cli/migration/moin19/macro_migration.py   | 26 +++---
 .../cli/migration/moin19/macros/FullSearch.py | 26 +++---
 .../migration/moin19/macros/MonthCalendar.py  | 26 +++---
 .../cli/migration/moin19/macros/PageList.py   | 22 +++---
 .../cli/migration/moin19/macros/__init__.py   |  2 +-
 .../_tests/test_FullSearch_migration.py       |  6 +-
 .../_tests/test_MonthCalendar_migration.py    |  2 +-
 .../macros/_tests/test_PageList_migration.py  |  2 +-
 src/moin/config/_tests/test_defaultconfig.py  |  4 +-
 src/moin/config/default.py                    |  8 +-
 src/moin/config/wikiconfig.py                 | 24 +++---
 src/moin/conftest.py                          |  2 +-
 src/moin/constants/__init__.py                |  2 +-
 src/moin/constants/contenttypes.py            |  8 +-
 src/moin/constants/forms.py                   |  4 +-
 src/moin/constants/itemtypes.py               |  2 +-
 src/moin/constants/keys.py                    | 24 +++---
 src/moin/constants/misc.py                    | 12 +--
 src/moin/constants/namespaces.py              |  4 +-
 src/moin/constants/rights.py                  |  6 +-
 src/moin/constants/tools/chartypes_create.py  |  3 +-
 src/moin/contrib/__init__.py                  |  2 +-
 src/moin/contrib/wsgi/moin2wsgi.py            | 16 ++--
 src/moin/converters/__init__.py               | 10 +--
 src/moin/converters/_args.py                  |  8 +-
 src/moin/converters/_args_wiki.py             | 14 ++--
 src/moin/converters/_table.py                 |  2 +-
 src/moin/converters/_tests/__init__.py        |  7 +-
 src/moin/converters/_tests/test__args.py      |  2 +-
 src/moin/converters/_tests/test__args_wiki.py |  2 +-
 .../converters/_tests/test__wiki_macro.py     |  2 +-
 src/moin/converters/_tests/test_creole_in.py  |  2 +-
 src/moin/converters/_tests/test_csv_in.py     |  6 +-
 src/moin/converters/_tests/test_docbook_in.py |  4 +-
 .../converters/_tests/test_docbook_out.py     |  2 +-
 src/moin/converters/_tests/test_everything.py |  2 +-
 src/moin/converters/_tests/test_html_in.py    |  2 +-
 .../converters/_tests/test_html_in_out.py     |  2 +-
 src/moin/converters/_tests/test_html_out.py   |  2 +-
 src/moin/converters/_tests/test_image.py      |  6 +-
 src/moin/converters/_tests/test_include.py    | 18 ++---
 src/moin/converters/_tests/test_link.py       |  2 +-
 .../converters/_tests/test_markdown_in.py     |  7 +-
 .../converters/_tests/test_markdown_in_out.py |  2 +-
 .../converters/_tests/test_mediawiki_in.py    |  2 +-
 .../converters/_tests/test_moinwiki19_in.py   |  6 +-
 .../_tests/test_moinwiki19_in_20_out.py       |  6 +-
 .../converters/_tests/test_moinwiki_in.py     | 12 +--
 .../converters/_tests/test_moinwiki_in_out.py |  4 +-
 .../converters/_tests/test_moinwiki_out.py    |  2 +-
 src/moin/converters/_tests/test_registry.py   |  2 +-
 src/moin/converters/_tests/test_rst_in.py     |  2 +-
 src/moin/converters/_tests/test_rst_in_out.py |  2 +-
 src/moin/converters/_tests/test_rst_out.py    |  2 +-
 src/moin/converters/_tests/test_smiley.py     | 16 ++--
 src/moin/converters/_util.py                  | 18 ++---
 src/moin/converters/_wiki_macro.py            | 14 ++--
 src/moin/converters/archive_in.py             | 12 +--
 src/moin/converters/audio_video_in.py         |  6 +-
 src/moin/converters/creole_in.py              |  8 +-
 src/moin/converters/docbook_in.py             | 16 ++--
 src/moin/converters/docbook_out.py            | 10 +--
 src/moin/converters/everything.py             |  6 +-
 src/moin/converters/highlight.py              |  6 +-
 src/moin/converters/html_in.py                | 22 +++---
 src/moin/converters/html_out.py               | 10 +--
 src/moin/converters/image_in.py               |  8 +-
 src/moin/converters/include.py                |  8 +-
 src/moin/converters/link.py                   |  6 +-
 src/moin/converters/macro.py                  |  6 +-
 src/moin/converters/markdown_in.py            |  6 +-
 src/moin/converters/markdown_out.py           | 10 +--
 src/moin/converters/mediawiki_in.py           |  2 +-
 src/moin/converters/moinwiki19_in.py          |  2 +-
 src/moin/converters/moinwiki_in.py            |  2 +-
 src/moin/converters/moinwiki_out.py           | 10 +--
 src/moin/converters/nonexistent_in.py         |  8 +-
 src/moin/converters/nowiki.py                 |  6 +-
 src/moin/converters/opendocument_in.py        |  6 +-
 src/moin/converters/pdf_in.py                 |  4 +-
 src/moin/converters/pygments_in.py            |  2 +-
 src/moin/converters/rst_in.py                 | 10 +--
 src/moin/converters/rst_out.py                | 12 +--
 src/moin/converters/smiley.py                 | 10 +--
 src/moin/converters/text_csv_in.py            |  6 +-
 src/moin/converters/text_in.py                |  6 +-
 src/moin/converters/text_out.py               |  8 +-
 src/moin/converters/xml_in.py                 |  2 +-
 src/moin/datastructures/__init__.py           |  2 +-
 src/moin/datastructures/backends/__init__.py  | 28 +++----
 .../backends/_tests/__init__.py               | 10 +--
 .../backends/_tests/test_composite_dicts.py   |  2 +-
 .../backends/_tests/test_composite_groups.py  |  2 +-
 .../backends/_tests/test_config_dicts.py      |  2 +-
 .../backends/_tests/test_config_groups.py     |  2 +-
 .../_tests/test_lazy_config_groups.py         |  4 +-
 .../backends/_tests/test_wiki_dicts.py        |  2 +-
 .../backends/_tests/test_wiki_groups.py       |  7 +-
 .../backends/composite_dicts.py               |  6 +-
 .../backends/composite_groups.py              | 13 ++-
 .../datastructures/backends/config_dicts.py   |  4 +-
 .../datastructures/backends/config_groups.py  |  8 +-
 .../backends/config_lazy_groups.py            |  8 +-
 .../datastructures/backends/wiki_dicts.py     |  9 +--
 .../datastructures/backends/wiki_groups.py    | 11 ++-
 src/moin/error.py                             | 42 +++++-----
 src/moin/forms.py                             |  4 +-
 src/moin/help/__init__.py                     |  4 +-
 src/moin/i18n/__init__.py                     | 35 ++++----
 src/moin/i18n/_tests/test_i18n.py             |  8 +-
 src/moin/items/__init__.py                    |  8 +-
 src/moin/items/_tests/test_Blog.py            | 50 ++++++------
 src/moin/items/_tests/test_Content.py         | 26 +++---
 src/moin/items/_tests/test_Item.py            | 20 ++---
 src/moin/items/blog.py                        | 12 +--
 src/moin/items/content.py                     | 12 +--
 src/moin/items/ticket.py                      | 32 ++++----
 src/moin/log.py                               | 68 ++++++++--------
 src/moin/macros/Anchor.py                     | 11 +--
 src/moin/macros/Date.py                       | 18 ++---
 src/moin/macros/DateTime.py                   |  4 +-
 src/moin/macros/FontAwesome.py                |  8 +-
 src/moin/macros/GetText.py                    | 11 ++-
 src/moin/macros/GetVal.py                     |  2 +-
 src/moin/macros/HighlighterList.py            |  8 +-
 src/moin/macros/Icon.py                       | 12 +--
 src/moin/macros/ItemList.py                   | 14 ++--
 src/moin/macros/MailTo.py                     | 12 +--
 src/moin/macros/MonthCalendar.py              | 16 ++--
 src/moin/macros/PageTitle.py                  |  5 +-
 src/moin/macros/RandomItem.py                 | 10 +--
 src/moin/macros/RandomQuote.py                |  4 +-
 src/moin/macros/ShowIcons.py                  |  2 +-
 src/moin/macros/ShowSmileys.py                |  2 +-
 src/moin/macros/ShowUserGroup.py              |  6 +-
 src/moin/macros/ShowWikiDict.py               |  6 +-
 src/moin/macros/SlideShow.py                  |  5 +-
 src/moin/macros/TitleIndex.py                 |  8 +-
 src/moin/macros/Verbatim.py                   |  2 +-
 src/moin/macros/__init__.py                   |  2 +-
 src/moin/macros/_base.py                      | 14 ++--
 src/moin/macros/_tests/test_Anchor.py         |  7 +-
 src/moin/macros/_tests/test_Date.py           | 11 ++-
 src/moin/macros/_tests/test_DateTime.py       | 21 ++---
 src/moin/macros/_tests/test_GetText.py        |  4 +-
 src/moin/macros/_tests/test_GetVal.py         |  7 +-
 src/moin/macros/_tests/test_ItemList.py       |  6 +-
 src/moin/macros/_tests/test_MonthCalendar.py  |  8 +-
 src/moin/macros/_tests/test_ShowIcons.py      | 10 +--
 src/moin/macros/_tests/test_ShowSmileys.py    |  4 +-
 src/moin/macros/_tests/test_Verbatim.py       |  2 +-
 src/moin/macros/_tests/test__base.py          | 22 +++---
 src/moin/mail/__init__.py                     |  4 +-
 src/moin/mail/_tests/test_sendmail.py         | 12 +--
 src/moin/mail/sendmail.py                     |  6 +-
 src/moin/search/__init__.py                   |  6 +-
 src/moin/search/_tests/test_analyzers.py      | 12 +--
 src/moin/search/analyzers.py                  | 22 +++---
 src/moin/security/__init__.py                 |  6 +-
 src/moin/security/_tests/test_security.py     |  4 +-
 src/moin/signalling/__init__.py               |  5 +-
 src/moin/signalling/log.py                    |  2 +-
 src/moin/signalling/signals.py                |  4 +-
 src/moin/storage/__init__.py                  | 22 +++---
 src/moin/storage/backends/__init__.py         | 24 +++---
 src/moin/storage/backends/_tests/__init__.py  | 12 +--
 .../backends/_tests/test_fileserver.py        | 18 ++---
 .../storage/backends/_tests/test_stores.py    |  6 +-
 src/moin/storage/backends/_util.py            | 19 ++---
 src/moin/storage/backends/fileserver.py       | 16 ++--
 src/moin/storage/backends/stores.py           | 12 +--
 src/moin/storage/error.py                     |  2 +-
 src/moin/storage/middleware/__init__.py       |  2 +-
 .../storage/middleware/_tests/__init__.py     |  2 +-
 .../middleware/_tests/test_indexing.py        |  8 +-
 .../middleware/_tests/test_protecting.py      | 22 +++---
 .../storage/middleware/_tests/test_routing.py |  4 +-
 .../middleware/_tests/test_serialization.py   |  8 +-
 .../middleware/_tests/test_validation.py      |  4 +-
 src/moin/storage/middleware/indexing.py       | 37 +++++----
 src/moin/storage/middleware/protecting.py     |  6 +-
 src/moin/storage/middleware/routing.py        | 22 +++---
 src/moin/storage/middleware/serialization.py  | 20 ++---
 src/moin/storage/middleware/validation.py     | 29 ++++---
 src/moin/storage/stores/__init__.py           | 46 +++++------
 src/moin/storage/stores/_tests/__init__.py    |  2 +-
 src/moin/storage/stores/_tests/conftest.py    |  8 +-
 src/moin/storage/stores/_tests/test_all.py    |  2 +-
 src/moin/storage/stores/_tests/test_fs.py     |  2 +-
 src/moin/storage/stores/_tests/test_memory.py |  2 +-
 src/moin/storage/stores/_tests/test_sqla.py   |  2 +-
 src/moin/storage/stores/_tests/test_sqlite.py |  2 +-
 src/moin/storage/stores/fs.py                 | 10 +--
 src/moin/storage/stores/memory.py             |  4 +-
 src/moin/storage/stores/sqla.py               | 20 ++---
 src/moin/storage/stores/sqlite.py             | 43 +++++-----
 src/moin/storage/stores/wrappers.py           |  4 +-
 src/moin/themes/__init__.py                   | 10 ++-
 src/moin/themes/_tests/test_navi_bar.py       |  2 +-
 src/moin/user.py                              | 14 ++--
 src/moin/utils/__init__.py                    | 24 +++---
 src/moin/utils/_tests/test_crypto.py          |  6 +-
 src/moin/utils/_tests/test_diff3.py           |  2 +-
 src/moin/utils/_tests/test_diff_datastruct.py |  2 +-
 src/moin/utils/_tests/test_diff_html.py       |  8 +-
 src/moin/utils/_tests/test_diff_text.py       |  4 +-
 src/moin/utils/_tests/test_filesys.py         | 18 ++---
 src/moin/utils/_tests/test_forms.py           |  4 +-
 src/moin/utils/_tests/test_interwiki.py       | 28 +++----
 src/moin/utils/_tests/test_iri.py             |  2 +-
 src/moin/utils/_tests/test_mime.py            |  2 +-
 src/moin/utils/_tests/test_mimetype.py        |  4 +-
 src/moin/utils/_tests/test_notifications.py   |  2 +-
 src/moin/utils/_tests/test_paramparser.py     |  2 +-
 src/moin/utils/_tests/test_pysupport.py       | 24 +++---
 src/moin/utils/_tests/test_registry.py        |  2 +-
 src/moin/utils/_tests/test_send_file.py       |  4 +-
 src/moin/utils/_tests/test_show_time.py       | 20 +++--
 src/moin/utils/_tests/test_subscriptions.py   |  4 +-
 src/moin/utils/_tests/test_thread_monitor.py  | 12 +--
 src/moin/utils/_tests/test_tree.py            |  2 +-
 src/moin/utils/_tests/test_util.py            |  4 +-
 src/moin/utils/clock.py                       | 14 ++--
 src/moin/utils/crypto.py                      | 63 ++++++++-------
 src/moin/utils/diff3.py                       | 24 +++---
 src/moin/utils/diff_datastruct.py             | 10 +--
 src/moin/utils/diff_html.py                   |  4 +-
 src/moin/utils/diff_text.py                   | 16 ++--
 src/moin/utils/edit_locking.py                | 28 +++----
 src/moin/utils/filesys.py                     | 20 ++---
 src/moin/utils/forms.py                       | 10 +--
 src/moin/utils/interwiki.py                   | 64 +++++++--------
 src/moin/utils/iri.py                         |  4 +-
 src/moin/utils/mime.py                        | 10 +--
 src/moin/utils/mimetype.py                    | 69 ++++++++--------
 src/moin/utils/monkeypatch.py                 | 12 +--
 src/moin/utils/notifications.py               | 53 ++++++-------
 src/moin/utils/paramparser.py                 |  8 +-
 src/moin/utils/plugins.py                     | 28 +++----
 src/moin/utils/pysupport.py                   | 34 ++++----
 src/moin/utils/registry.py                    | 22 +++---
 src/moin/utils/rev_navigation.py              |  4 +-
 src/moin/utils/send_file.py                   | 22 +++---
 src/moin/utils/show_time.py                   | 18 ++---
 src/moin/utils/subscriptions.py               | 20 ++---
 src/moin/utils/thread_monitor.py              | 23 +++---
 src/moin/utils/tree.py                        |  8 +-
 src/moin/wikiutil.py                          | 22 +++---
 340 files changed, 2026 insertions(+), 1994 deletions(-)

diff --git a/_ui_tests/config.py b/_ui_tests/config.py
index 4f5f2f642..ce2eddcfe 100644
--- a/_ui_tests/config.py
+++ b/_ui_tests/config.py
@@ -1,6 +1,6 @@
 # Copyright: 2012 MoinMoin:HughPerkins
 # License: GNU GPL v3 (or any later version), see LICENSE.txt for details.
 
-"""Contains global configuration for functional tests"""
+"""Contains global configuration for functional tests."""
 
 BASE_URL = "http://localhost:8080/"
diff --git a/_ui_tests/conftest.py b/_ui_tests/conftest.py
index 47a418bc8..099ec5305 100644
--- a/_ui_tests/conftest.py
+++ b/_ui_tests/conftest.py
@@ -2,9 +2,10 @@
 # License: GNU GPL v3 (or any later version), see LICENSE.txt for details.
 
 """
-Contains events called by pytest during the life-cycle of the test suite
+Pytest hook definitions used during the lifecycle of the test suite.
+
 This module is automatically loaded by pytest, which looks for a file
-of this name
+with this name.
 """
 
 import os
@@ -16,15 +17,18 @@
 
 def pytest_runtest_makereport(item, call):
     """
-    Entry point for event which occurs after each test has run
-    The parameters are:
-    - item: the method called
-    - call: an object of type CallInfo, which has two properties, of which
-      excinfo contains info about any exception that got thrown by the method
-    This method is called automatically by pytest.  The name of the method
-    is used by pytest to locate it, and decide when to call it
-    This specific method instance is used to take a screenshot whenever a test
-    fails, ie whenever the method throws an exception
+    Entry point for the event that occurs after each test has run.
+
+    Parameters:
+    - item: the test function being executed
+    - call: a CallInfo object; its excinfo attribute contains information about
+      any exception raised by the test
+
+    This function is called automatically by pytest. The function name is used
+    by pytest to locate it and to decide when to call it.
+
+    This hook is used to take a screenshot whenever a test fails, i.e., whenever
+    the test raises an exception.
     """
     if call.excinfo is not None:
         if driver_register.get_driver() is not None and hasattr(item, "obj"):
diff --git a/_ui_tests/driver_register.py b/_ui_tests/driver_register.py
index a641e728a..b4cc5e972 100644
--- a/_ui_tests/driver_register.py
+++ b/_ui_tests/driver_register.py
@@ -2,9 +2,8 @@
 # License: GNU GPL v3 (or any later version), see LICENSE.txt for details.
 
 """
-This module is used to register the webdriver driver module as a global
-variable, so that it can be used by conftest methods, eg for doing a
-printscreen when a test fails
+Register the WebDriver instance as a global so it can be accessed by
+conftest hooks, e.g., to take a screenshot when a test fails.
 """
 
 driver = None
@@ -12,7 +11,7 @@
 
 def register_driver(driver_):
     """
-    set the driver global variable to driver_
+    Set the global driver variable to driver_.
     """
     global driver
     driver = driver_
@@ -20,7 +19,7 @@ def register_driver(driver_):
 
 def get_driver():
     """
-    get the value of the driver global variable
+    Get the value of the global driver variable.
     """
     global driver
     return driver
diff --git a/_ui_tests/test_subitems.py b/_ui_tests/test_subitems.py
index fca728b32..4077ff8b0 100644
--- a/_ui_tests/test_subitems.py
+++ b/_ui_tests/test_subitems.py
@@ -1,24 +1,24 @@
 # Copyright: 2012 MoinMoin:HughPerkins
 # License: GNU GPL v3 (or any later version), see LICENSE.txt for details.
 
-"""Functional test: create subitem"""
+"""Functional test: create subitem."""
 
 import config
 import utils
 
 
 class TestSubitems:
-    """Functional test: create subitem"""
+    """Functional test: create subitem."""
 
     def setup_class(self):
-        """opens browser and creates some random item names for these tests"""
+        """Open the browser and create random item names for these tests."""
         self.driver = utils.create_browser()
         self.base_url = config.BASE_URL
         self.base_item_name = "page_" + utils.generate_random_word(5)
         self.subitem_name = "subitem_" + utils.generate_random_word(5)
 
     def create_wiki_item(self, item_name):
-        """Creates a new wiki item with name 'item_name'"""
+        """Create a new wiki item with the name 'item_name'."""
         driver = self.driver
 
         driver.get(self.base_url + "/" + item_name)
@@ -29,7 +29,7 @@ def create_wiki_item(self, item_name):
         driver.find_element_by_id("f_submit").click()
 
     def test_createsubitem(self):
-        """Test create subitem"""
+        """Test creating a subitem."""
         driver = self.driver
 
         self.create_wiki_item(self.base_item_name)
@@ -48,14 +48,14 @@ def test_createsubitem(self):
         assert driver.title.split(" - ")[0] == self.base_item_name + "/" + self.subitem_name
 
     def teardown_class(self):
-        """shuts down browser"""
+        """Shut down the browser."""
         self.driver.quit()
 
 
 if __name__ == "__main__":
-    # This lets us run the test directly, without using pytest
-    # This is useful for example for being able to call help, eg
-    # 'help(driver)', or 'help(driver.find_element_by_id("f_submit"))'
+    # This lets us run the test directly, without using pytest.
+    # This is useful, for example, for being able to call help, e.g.,
+    # 'help(driver)' or 'help(driver.find_element_by_id("f_submit"))'.
     testSubitems = TestSubitems()
     testSubitems.setup_class()
     testSubitems.test_createsubitem()
diff --git a/_ui_tests/utils.py b/_ui_tests/utils.py
index 00b6be3bc..74a7cd2d6 100644
--- a/_ui_tests/utils.py
+++ b/_ui_tests/utils.py
@@ -2,7 +2,7 @@
 # Copyright: 2012 MoinMoin:HughPerkins
 # License: GNU GPL v3 (or any later version), see LICENSE.txt for details.
 
-"""Functions to facilitate functional testing"""
+"""Functions to facilitate functional testing."""
 
 import random
 import urllib.request, urllib.parse, urllib.error
@@ -24,22 +24,21 @@
 
 def create_browser():
     """
-    Instantiates a firefox browser object, and configures it for English language
-    and registers it for screenshots, and sets the timeout
+    Instantiate a Firefox browser object, configure it for English,
+    register it for screenshots, and set the timeout.
     """
     profile = webdriver.FirefoxProfile()
     profile.set_preference("intl.accept_languages", "en")
     driver = webdriver.Firefox(firefox_profile=profile)
-    driver_register.register_driver(driver)  # register with
-    # driver_register, which is needed so that printscreen on test
-    # failure works
+    driver_register.register_driver(driver)  # Register with driver_register so that
+    # taking a screenshot on test failure works.
     driver.implicitly_wait(20)
     return driver
 
 
 def generate_random_word(length):
     """
-    generates a random string containing numbers, of length 'length'
+    Generate a random numeric string of length 'length'.
     """
     word = str(random.randint(10 ** (length - 1), 10**length))
     return word
@@ -47,8 +46,8 @@ def generate_random_word(length):
 
 def generate_random_name(prefix, totallength):
     """
-    create a random name, starting with 'prefix'
-    of total length 'totallength'
+    Create a random name starting with 'prefix',
+    with a total length of 'totallength'.
     """
     length = totallength - len(prefix)
     numberword = generate_random_word(length)
diff --git a/contrib/css-lint/lint-prep.py b/contrib/css-lint/lint-prep.py
index 7346fa63f..95e567db5 100644
--- a/contrib/css-lint/lint-prep.py
+++ b/contrib/css-lint/lint-prep.py
@@ -1,9 +1,9 @@
 """
-    Reads a variables.css file and a common.css (or theme.css) file, outputs a lint.css file
-    similar to the common.css file but having all var(...) expressions replaced with the values
-    within the variables.css file. The output file can then be submitted to a css validator.
+    Reads a variables.css file and a common.css (or theme.css) file, and outputs a lint.css file
+    similar to common.css but with all var(...) expressions replaced with the values
+    from variables.css. The output file can then be submitted to a CSS validator.
 
-    This program will be obsolete when a css lint program supports variables.
+    This program will be obsolete when a CSS lint program supports variables.
 """
 
 variables_in = "../../src/moin/static/css/variables.css"
@@ -37,7 +37,7 @@ def parse_variables():
 
 def create_lint(vars):
     """
-    Read css file and replace variable names with values.
+    Read the CSS file and replace variable names with values.
     """
     with open(css_in) as f:
         lines = f.readlines()
diff --git a/contrib/loadtesting/locust/locustfile.py b/contrib/loadtesting/locust/locustfile.py
index aeed92768..b1a16865f 100644
--- a/contrib/loadtesting/locust/locustfile.py
+++ b/contrib/loadtesting/locust/locustfile.py
@@ -16,16 +16,16 @@
 These comments are also used as content when moin items are created; the result is
 a small load is placed upon the Whoosh indexer.
 
-The  primary goal of this test is to create a server overload. A server overload will likely take the
+The primary goal of this test is to create a server overload. A server overload will likely take the
 form of a LockError in the Whoosh AsyncWriter (/whoosh/writing.py). Each thread attempting
 to update the Whoosh index tries to obtain the write lock for a short period of time (~5
 seconds). If the lock is not obtained, a LockError exception is raised and the console log
 will show a traceback with the message "server overload or corrupt index". The item was
-saved but cannot be accessed because it is not in the index - to correct the error,
-stop the server, rebuild the indexes, restart the server.
+saved but cannot be accessed because it is not in the index — to correct the error,
+stop the server, rebuild the indexes, and restart the server.
 
 The maximum load that the wiki server can process is established by trial and error.
-With the default wait_time of 2-3 seconds running 3 symultaneous users will create a load of about
+With the default wait_time of 2–3 seconds, running 3 simultaneous users will create a load of about
 one transaction per second. Running 30 users could create a load of about 10
 transactions per second - but this may be reduced because the wiki server will have slow responses.
 
@@ -39,13 +39,13 @@
 and create wiki items as part of the test. It is best to start with
 an empty wiki (./m new-wiki).
 
-Each locust user registers a new id, creates and updates a home page in the user namespace,
-creates and updates a <username> item in the default namespace, and logs-out.
+Each Locust user registers a new ID, creates and updates a home page in the user namespace,
+creates and updates a <username> item in the default namespace, and logs out.
 
-Because each locust user is working on unique items, it does not test edit locking. Use locustfile2.py
-to stress test edit locking.
+Because each Locust user is working on unique items, it does not test edit locking. Use locustfile2.py
+to stress-test edit locking.
 
-To load test Moin2:
+To load-test Moin 2:
  * read about Locust at https://docs.locust.io/en/stable/index.html - last tested with Locust 2.9.0
  * install Locust per the docs in its own venv
  * open a terminal window and start the Moin built-in server (./m run)
@@ -62,17 +62,17 @@
  * customize and repeat:
     * ./m del-wiki
     * ./m new-wiki
-    * restart Moin2 buit-in server
+    * restart the Moin 2 built-in server
     * restart Locust server
     * refresh browser window
 """
 
 
-# used to create unique user IDs
+# Used to create unique user IDs
 user_number = 0
-# min and max wait time in seconds between user transactions, ignored, there is only 1 task
+# Min and max wait time in seconds between user transactions; ignored, there is only 1 task
 wait_time = between(2, 3)
-# sleep time between GET, POST requests in seconds
+# Sleep time between GET and POST requests, in seconds
 sleep_time = 0
 
 
@@ -80,10 +80,10 @@ class LoadTest(HttpUser):
     """
     First, create a Home page in the default and user namespaces.
 
-    Next create a workflow for each locust user that will
-    register a new user, login, create a user home page,
-    modify user home page several times,
-    create a new item, modify new item several times, and logout.
+    Next, create a workflow for each Locust user that will
+    register a new user, log in, create a user home page,
+    modify the user home page several times,
+    create a new item, modify the new item several times, and log out.
     """
 
     @events.test_start.add_listener
@@ -207,7 +207,7 @@ def click_post_login(self):
                 print("%s: response.status_code = %s" % (sys._getframe().f_lineno, response.status_code))
 
     def create_home_page(self):
-        # click link to users home page (home page has not been created: 404 expected)
+        # Click link to the user's home page (home page has not been created: 404 expected)
         with self.client.get(self.user_home_page, catch_response=True) as response:
             if response.status_code == 404:
                 response.success()
@@ -249,7 +249,7 @@ def create_home_page(self):
                 print("%s: response.status_code = %s" % (sys._getframe().f_lineno, response.status_code))
 
     def modify_home_page(self, idx):
-        # get users home page
+        # Get the user's home page
         with self.client.get(self.user_home_page, catch_response=True) as response:
             if response.status_code != 200:
                 print("%s: response.status_code = %s" % (sys._getframe().f_lineno, response.status_code))
@@ -267,7 +267,7 @@ def modify_home_page(self, idx):
             home_page,
             {
                 "content_form_data_text": test_content % (self.user_name, self.get_time() + " idx=%s" % idx),
-                "comment": "my homepage comment",
+                "comment": "my home page comment",
                 "submit": "OK",
                 "meta_form_contenttype": "text/x.moin.wiki;charset=utf-8",
                 "meta_form_itemtype": "default",
diff --git a/contrib/loadtesting/locust/locustfile2.py b/contrib/loadtesting/locust/locustfile2.py
index d2c4d6dc8..66685648e 100644
--- a/contrib/loadtesting/locust/locustfile2.py
+++ b/contrib/loadtesting/locust/locustfile2.py
@@ -5,7 +5,7 @@
 This Locust test script may be used to identify bugs that may occur
 when an item is updated by multiple users in rapid succession.
 
-This test requires user self-registration, set wikiconfig configuration to:
+This test requires user self-registration; set the wikiconfig.py configuration to:
     registration_only_by_superuser = False
     user_email_verification = False
     edit_locking_policy = "lock"
@@ -22,7 +22,7 @@
 attempt, then a new <username> item is created and any remaining fail
 messages are written to the item.
 
-To load test Moin2:
+To load-test Moin 2:
  * read about Locust at https://docs.locust.io/en/stable/index.html - last tested with Locust 2.9.0
  * install Locust per the docs in its own venv
  * open a terminal window and start the Moin built-in server (./m run)
@@ -39,7 +39,7 @@
  * customize and repeat:
     * ./m del-wiki
     * ./m new-wiki
-    * restart Moin2 buit-in server
+    * restart the Moin 2 built-in server
     * restart Locust server
     * refresh browser window
 """
@@ -53,16 +53,16 @@
 from locust import HttpLocust, Locust, TaskSet, HttpUser, task, SequentialTaskSet, between, User, events
 
 
-# used to create unique user IDs
+# Used to create unique user IDs
 user_number = 0
-# min and max wait time in seconds between user transactions, ignored, there is only 1 task
+# Min and max wait time in seconds between user transactions; ignored, there is only 1 task
 wait_time = between(2, 3)
-# sleep time between GET, POST requests in seconds
+# Sleep time between GET and POST requests, in seconds
 sleep_time = 0
 
 
 def get_textarea(html):
-    """Return contents of textarea where html is html output from +modify"""
+    """Return the contents of the textarea where html is the HTML output from +modify."""
     try:
         html_ = html.split("<textarea ")[1]
         html_ = html_.split(">")[1]
@@ -73,7 +73,7 @@ def get_textarea(html):
 
 
 def format_date_time(dt=None):
-    """Return current or passed (dt) time in a human readable format."""
+    """Return the current time or the passed (dt) time in a human-readable format."""
     if dt is None:
         dt = datetime.datetime.now()
     fmt = "%Y-%m-%d %H:%M:%S"
@@ -83,12 +83,12 @@ def format_date_time(dt=None):
 
 class LoadTest(HttpUser):
     """
-    On start, create the Home page. Register a new user, login, modify the Home page several times, and logout.
+    On start, create the Home page. Register a new user, log in, modify the Home page several times, and log out.
     """
 
     @events.test_start.add_listener
     def on_test_start(environment, **kwargs):
-        """create Home item"""
+        """Create Home item"""
         parser = argparse.ArgumentParser()
         parser.add_argument("--host", "-H")
         args, unknown = parser.parse_known_args()
@@ -116,7 +116,7 @@ def on_test_start(environment, **kwargs):
 
     @task(1)
     def user_workflow(self):
-        """Define workflow for each locust"""
+        """Define workflow for each Locust user."""
         self.get_home()
         time.sleep(sleep_time)
         self.click_login()
@@ -139,7 +139,7 @@ def user_workflow(self):
     def get_home(self):
         self.count = 0
         self.message = ""
-        # Home and users/Home have been created by setup, see below
+        # Home and users/Home have been created by setup; see below
         with self.client.get("/Home", catch_response=True) as response:
             if response.status_code != 200:
                 print("%s: response.status_code = %s" % (sys._getframe().f_lineno, response.status_code))
@@ -212,8 +212,8 @@ def update_home_page(self, idx):
             if response.status_code != 200:
                 print("%s: response.status_code = %s" % (sys._getframe().f_lineno, response.status_code))
             if b"is locked by" in response.content:
-                # someone else has item locked for editing
-                self.message += "\n\n%s Item %s is locked, Locust user %s cannot do change number %s" % (
+                # Someone else has the item locked for editing
+                self.message += "\n\n%s Item %s is locked; Locust user %s cannot make change number %s" % (
                     dt,
                     item_name,
                     self.user_name,
diff --git a/contrib/pythonanywhere/_pythonanywhere_com_wsgi.py b/contrib/pythonanywhere/_pythonanywhere_com_wsgi.py
index b1924cb36..68eb36cf7 100644
--- a/contrib/pythonanywhere/_pythonanywhere_com_wsgi.py
+++ b/contrib/pythonanywhere/_pythonanywhere_com_wsgi.py
@@ -1,4 +1,4 @@
-# Copy the contents of this file to the pythonanywhere
-# WSGI configuration file:  /var/www/<account-name>_pythonanywhere_com_wsgi.py
+# Copy the contents of this file to the PythonAnywhere
+# WSGI configuration file: /var/www/<account-name>_pythonanywhere_com_wsgi.py
 
 from wsgi import application  # noqa
diff --git a/contrib/pythonanywhere/wsgi.py b/contrib/pythonanywhere/wsgi.py
index ccbff7899..33fb0e76a 100644
--- a/contrib/pythonanywhere/wsgi.py
+++ b/contrib/pythonanywhere/wsgi.py
@@ -1,7 +1,7 @@
 # Copyright: 2020 MoinMoin:RogerHaase
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
-# Upload this file to the pythonanywhere
+# Upload this file to PythonAnywhere.
 # Working directory: /home/<account-name>/moin
 
 import sys
diff --git a/contrib/wikiconfig/wikiconfig_editme.py b/contrib/wikiconfig/wikiconfig_editme.py
index 655470f73..c2b257b9c 100644
--- a/contrib/wikiconfig/wikiconfig_editme.py
+++ b/contrib/wikiconfig/wikiconfig_editme.py
@@ -1,6 +1,6 @@
 """
-The intended use of wikiconfig_editme.py is for developers who want to add/remove
-wikiconfig.py options for testing. Making quick changes in a small file can be
+The intended use of wikiconfig_editme.py is to let developers add or remove
+wikiconfig.py options for testing. Making quick changes in this small file can be
 easier than editing a larger file.
 """
 
diff --git a/contrib/wikiconfig/wikiconfig_local.py b/contrib/wikiconfig/wikiconfig_local.py
index 584b5019a..aa6ec942b 100644
--- a/contrib/wikiconfig/wikiconfig_local.py
+++ b/contrib/wikiconfig/wikiconfig_local.py
@@ -1 +1,6 @@
-from wikiconfig_editme import *
+"""
+Local overrides for wikiconfig used during development and testing.
+Import all symbols from wikiconfig_editme so developers can tweak options easily.
+"""
+
+from wikiconfig_editme import *  # noqa: F401,F403
diff --git a/contrib/wsgi/profiler.py b/contrib/wsgi/profiler.py
index f915dee67..f7aaa1c13 100644
--- a/contrib/wsgi/profiler.py
+++ b/contrib/wsgi/profiler.py
@@ -1,17 +1,17 @@
 """
-    MoinMoin - WSGI middlewares for profiling
+    MoinMoin - WSGI middleware for profiling
 
     These have been ported from server_standalone to provide application
     profiling for a WSGI application. They are implemented as WSGI
     middlewares, so they can be plugged right in front of the MoinMoin
-    WSGI application. Attention has to be payed, that at the end of
-    profiling the `shutdown`-method has to be invoked, so that the
-    middlewares can write the reports to the filesystem.
+    WSGI application. Attention has to be paid that, at the end of
+    profiling, the `shutdown` method must be invoked so that the
+    middleware can write the reports to the file system.
 
-    TODO: in pre-WSGI MoinMoin those profilers where integrated in
+    TODO: in pre-WSGI MoinMoin those profilers were integrated into
           the standalone server and also some other gateway interfaces.
-          In the near future the middlewares here could be again made
-          configurable automatically with command line switches or
+          In the near future, the middleware here could again be made
+          configurable automatically with command-line switches or
           wiki configuration options.
 
     @copyright: 2008 MoinMoin:FlorianKrupicka,
@@ -67,7 +67,7 @@ def shutdown(self):
 
 
 class CProfileMiddleware(ProfilerMiddleware):
-    """A profiler based on the the cProfile module from the standard lib."""
+    """A profiler based on the cProfile module from the standard library."""
 
     def __init__(self, app, filename):
         super().__init__(app)
@@ -82,7 +82,7 @@ def shutdown(self):
 
 
 class PycallgraphMiddleware(ProfilerMiddleware):
-    """A call graphing middleware utilizing the pycallgraph 3rd party
+    """A call-graphing middleware utilizing the pycallgraph third-party
     module (available at http://pycallgraph.slowchop.com/)."""
 
     def __init__(self, app, filename):
diff --git a/contrib/wsgi/proxy.py b/contrib/wsgi/proxy.py
index acc50da7c..7e75e9163 100644
--- a/contrib/wsgi/proxy.py
+++ b/contrib/wsgi/proxy.py
@@ -1,8 +1,8 @@
 """
-    WSGI Middleware for running WSGI apps behind proxies.
+    WSGI middleware for running WSGI apps behind proxies.
 
-    Analyzes HTTP-X-Forwarded-For header and uses the address our outermost
-    trusted proxy is seeing as REMOTE_ADDR.
+    Analyzes the X-Forwarded-For HTTP header and uses the address the outermost
+    trusted proxy sees as REMOTE_ADDR.
 
     @copyright: 2008 MoinMoin:FlorianKrupicka
     @license: GNU GPL, see COPYING for details.
diff --git a/docs/conf.py b/docs/conf.py
index e061b1f58..be325dddc 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -5,7 +5,7 @@
 # This file is execfile()d with the current directory set to its containing dir.
 #
 # Note that not all possible configuration values are present in this
-# autogenerated file.
+# auto-generated file.
 #
 # All configuration values have a default; values that are commented out
 # serve to show the default.
@@ -101,10 +101,10 @@
 # -- Options for HTML output ---------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
+# a list of built-in themes.
 # html_theme = 'classic'
 # html_theme = 'alabaster'
-html_theme = "sphinx_rtd_theme"  # winner, mobile friendly
+html_theme = "sphinx_rtd_theme"  # winner, mobile-friendly
 # html_theme = 'sphinxdoc'
 # html_theme = 'scrolls'
 # html_theme = 'agogo'
@@ -144,8 +144,8 @@
 html_favicon = "_static/favicon.ico"
 
 # Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
+# relative to this directory. They are copied after the built-in static files,
+# so a file named "default.css" will overwrite the built-in "default.css".
 html_static_path = ["_static"]
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
@@ -209,7 +209,7 @@
 # the title page.
 # latex_logo = None
 
-# For "manual" documents, if this is true, then toplevel headings are parts,
+# For "manual" documents, if this is true, then top-level headings are parts,
 # not chapters.
 # latex_use_parts = False
 
@@ -234,7 +234,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ("man/moin", "moin", "MoinMoin Commandline Interface", ["The MoinMoin developers"], 1),
+    ("man/moin", "moin", "MoinMoin Command-line Interface", ["The MoinMoin developers"], 1),
     ("index", "moinmoin", "MoinMoin Documentation", ["The MoinMoin developers"], 1),
 ]
 
@@ -251,7 +251,7 @@
         "MoinMoin Documentation",
         "The MoinMoin developers",
         "MoinMoin",
-        "One line description of project.",
+        "One-line description of the project.",
         "Miscellaneous",
     )
 ]
diff --git a/quickinstall.py b/quickinstall.py
index 0886794f8..b4d5560f7 100755
--- a/quickinstall.py
+++ b/quickinstall.py
@@ -4,7 +4,7 @@
 # Copyright: 2023-2024 MoinMoin:UlrichB
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
-Create a virtual environment and install moin2 and all requirements in development mode.
+Create a virtual environment and install Moin 2 and all requirements in development mode.
 
 Usage for installation:
 
@@ -12,26 +12,26 @@
 
 Requires: Python 3.9+, pip
 
-The first run of quickinstall.py creates these files or symlink in the repo root:
+The first run of quickinstall.py creates these files or symlinks in the repo root:
 
-    - unix: m, activate, wikiconfig.py, intermap.txt
-    - windows: m.bat, activate.bat, deactivate.bat, wikiconfig.py, intermap.txt
+    - Unix: m, activate, wikiconfig.py, intermap.txt
+    - Windows: m.bat, activate.bat, deactivate.bat, wikiconfig.py, intermap.txt
 
 After initial installation, a menu of frequently used commands is provided for
-moin2 developers and desktop wiki users.
+Moin 2 developers and desktop wiki users.
 
     - wraps a few commonly used moin commands, do "moin --help" for infrequently used commands
     - adds default file names for selected moin commands (backup, restore, ...)
     - creates log files for functions with large output, extracts success/failure messages
-    - displays error messages if user tries to run commands out of sequence
+    - displays error messages if the user tries to run commands out of sequence
 
 In normal usage, after the initial installation the user will activate the newly created
-virtualenv before executing commands.
+virtual environment before executing commands.
 
-usage (to display a menu of commands):
+Usage (to display a menu of commands):
 
-    - unix:     ./m
-    - windows:  m
+    - Unix:     ./m
+    - Windows:  m
 """
 
 
@@ -102,7 +102,7 @@
 
 quickinstall    update virtual environment with required packages
 extras          install packages required for docs and moin development
-docs            create moin html documentation (requires extras)
+docs            create Moin HTML documentation (requires extras)
 interwiki       refresh intermap.txt
 log <target>    view detailed log generated by <target>, omit to see list
 
@@ -177,7 +177,7 @@ def search_for_phrase(filename):
         ),
     }
     ignore_phrases = {TOX: ("interpreternotfound",)}
-    # for these file names, display a count of occurrances rather than each found line
+    # For these file names, display a count of occurrences rather than each found line
     print_counts = (CODING_STD, DIST)
 
     with open(filename) as f:
@@ -205,7 +205,7 @@ def search_for_phrase(filename):
 
 
 def wiki_exists():
-    """Return true if a wiki exists."""
+    """Return True if a wiki exists."""
     return bool(glob.glob("wiki/index/_all_revs_*.toc"))
 
 
@@ -248,19 +248,19 @@ def delete_files(pattern):
 
 
 def get_bootstrap_data_location():
-    """Return the virtualenv site-packages/xstatic/pkg/bootstrap/data location."""
+    """Return the virtual environment site-packages/xstatic/pkg/bootstrap/data location."""
     command = 'python -c "from xstatic.pkg.bootstrap import BASE_DIR; print(BASE_DIR)"'
     return subprocess.check_output(command, shell=True).decode()
 
 
 def get_pygments_data_location():
-    """Return the virtualenv site-packages/xstatic/pkg/pygments/data location."""
+    """Return the virtual environment site-packages/xstatic/pkg/pygments/data location."""
     command = 'python -c "from xstatic.pkg.pygments import BASE_DIR; print(BASE_DIR)"'
     return subprocess.check_output(command, shell=True).decode()
 
 
 def create_m():
-    """Create an 'm.bat or 'm' bash script that will run quickinstall.py using this Python"""
+    """Create an 'm.bat' or 'm' bash script that will run quickinstall.py using this Python"""
     if WINDOWS_OS:
         with open("m.bat", "w") as f:
             f.write(f":: {WIN_INFO}\n\n@{sys.executable} quickinstall.py %* --help\n")
@@ -595,17 +595,17 @@ def create_wrapper(self, filename, target):
             f.write(f":: {WIN_INFO}\n\n@call {target} %*\n")
 
     def do_helpers(self):
-        """Create small helper scripts or symlinks in repo root, avoid keying the long path to virtual env."""
+        """Create small helper scripts or symlinks in the repo root; avoid typing the long path to the virtual environment."""
         create_m()
         if WINDOWS_OS:
-            # windows commands are: activate | deactivate
+            # Windows commands are: activate | deactivate
             self.create_wrapper("activate.bat", "activate.bat")
             self.create_wrapper("deactivate.bat", "deactivate.bat")
         else:
-            # linux commands are: source activate | deactivate
+            # Linux commands are: source activate | deactivate
             if os.path.exists("activate"):
                 os.unlink("activate")
-            os.symlink(os.path.join(self.dir_venv_bin, "activate"), "activate")  # no need to define deactivate on unix
+            os.symlink(os.path.join(self.dir_venv_bin, "activate"), "activate")  # no need to define deactivate on Unix
 
 
 # code below and path_locations copied from virtualenv.py v16.7.10 because path_locations dropped in v20.0.0 rewrite.
@@ -623,7 +623,7 @@ def mkdir(at_path):
 
 def path_locations(home_dir, dry_run=False):
     """Return the path locations for the environment (where libraries are,
-    where scripts go, etc)"""
+    where scripts go, etc.)."""
     home_dir = os.path.abspath(home_dir)
     lib_dir, inc_dir, bin_dir = None, None, None
     # XXX: We'd use distutils.sysconfig.get_python_inc/lib but its
diff --git a/scripts/coding_std.py b/scripts/coding_std.py
index 3cb2be31e..af9a3b586 100644
--- a/scripts/coding_std.py
+++ b/scripts/coding_std.py
@@ -4,15 +4,15 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Detect and correct violations of the moin2 coding standards:
+Detect and correct violations of the Moin 2 coding standards:
     - no trailing blanks
-    - exactly one linefeed at file end, see PEP8
-    - DOS line endings on .bat and .cmd files, unix line endings everywhere else
+    - exactly one line feed at file end, see PEP 8
+    - DOS line endings on .bat and .cmd files, Unix line endings everywhere else
 
-Detect and write informative message:
-    - improper indentation of template files ending with .html suffix
+Detect and write informative messages:
+    - improper indentation of template files with the .html suffix
 
-Execute this script from the root directory of the moin repository
+Execute this script from the root directory of the Moin repository
 to process all files in the <root>/src directory.
 
 Or, pass a directory path on the command line.
@@ -25,17 +25,17 @@
 import re
 
 
-# file types to be processed
-# ignore help .meta and .data files; ckeditor uses tabs, markdown uses 2 trailing blanks for line break
+# File types to be processed
+# Ignore help .meta and .data files; CKEditor uses tabs, Markdown uses 2 trailing blanks for line breaks
 SELECTED_SUFFIXES = set("py bat cmd html css js styl less rst scss".split())
 
 # stuff considered DOS/WIN that must have \r\n line endings
 WIN_SUFFIXES = set("bat cmd".split())
 
-# these are media files from help-common namespace
+# These are media files from the help-common namespace
 BINARY_FILES = tuple(".gz.data .zip.data .mp3.data .jpg.data .png.data .mp4.data".split())
 
-# global variables for checking Javascript messages
+# Global variables for checking JavaScript messages
 phrases = set()
 phrases_used = set()
 
@@ -61,7 +61,7 @@ def log(self, heading, message):
 
 def directories_to_ignore(starting_dir):
     """Return a list of directories that will not be processed."""
-    # list format: [(fully qualified directory name, sub-directory name), ... ]
+    # List format: [(fully qualified directory name, subdirectory name), ...]
     ignore_dirs = []
     level2_dirs = ".eggs .git .tox contrib dlc env moin.egg-info wiki HTML".split()
     for dir in level2_dirs:
diff --git a/scripts/dos2unix.py b/scripts/dos2unix.py
index 485984305..b414c91e2 100644
--- a/scripts/dos2unix.py
+++ b/scripts/dos2unix.py
@@ -3,13 +3,13 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Alternative for unix dos2unix utility that may be run on either windows or unix. Does not implement
-typical unix dos2unix command line syntax.
+Alternative to the Unix dos2unix utility that can run on either Windows or Unix. Does not implement
+the typical Unix dos2unix command-line syntax.
 
-If passed parameter is a directory, all files in that directory are converted to unix line endings.
-Sub-directories are not processed.  If passed parameter is a filename, only that filename is converted.
+If the passed parameter is a directory, all files in that directory are converted to Unix line endings.
+Subdirectories are not processed. If the passed parameter is a filename, only that filename is converted.
 
-Usage: python <path_to>dos2unix.py <target_directory_or_filename>
+Usage: python path/to/dos2unix.py <target_directory_or_filename>
 """
 
 import os
@@ -17,7 +17,7 @@
 
 
 def convert_file(filename):
-    """Replace DOS line endings with unix line endings."""
+    """Replace DOS line endings with Unix line endings."""
     with open(filename, "rb") as f:
         data = f.read()
     if "\0" in data:
diff --git a/scripts/raw_wsgi_bench.py b/scripts/raw_wsgi_bench.py
index 4de119323..4655736fe 100644
--- a/scripts/raw_wsgi_bench.py
+++ b/scripts/raw_wsgi_bench.py
@@ -25,7 +25,7 @@
 
 for page in PAGES:
     print('=== Run with page "%s" ===' % page)
-    print("Running %i WSGI-requests:" % RUNS)
+    print("Running %i WSGI requests:" % RUNS)
     timing = time.time()
     for run in range(RUNS):
         response = client.get(f"/{page}")
@@ -37,6 +37,6 @@
     timing = time.time() - timing
 
     print()
-    print("Finished %i WSGI-requests in %.2f seconds" % (RUNS, timing))
+    print("Finished %i WSGI requests in %.2f seconds" % (RUNS, timing))
     print("Time per request: %.4f seconds" % (timing / RUNS))
     print("Requests per second: %.2f" % (RUNS / timing))
diff --git a/scripts/wget.py b/scripts/wget.py
index 6d5864983..3b7a455af 100644
--- a/scripts/wget.py
+++ b/scripts/wget.py
@@ -3,10 +3,10 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Alternative for unix wget utility that may be run on either windows or unix. Does not implement
-typical unix wget command line syntax.
+Alternative to the Unix wget utility that can run on either Windows or Unix. Does not implement
+the typical Unix wget command-line syntax.
 
-Usage:  python <path_to>wget.py <url> <output_file>
+Usage: python path/to/wget.py <url> <output_file>
 """
 
 import sys
@@ -18,4 +18,4 @@
         urllib.request.urlretrieve(sys.argv[1], sys.argv[2])
     else:
         print("Error: incorrect parameters passed.")
-        print("Usage:  python <path_to>wget.py <url> <output_file>")
+        print("Usage: python path/to/wget.py <url> <output_file>")
diff --git a/src/moin/__init__.py b/src/moin/__init__.py
index 27c457c8a..9bff0aa3a 100644
--- a/src/moin/__init__.py
+++ b/src/moin/__init__.py
@@ -4,7 +4,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - a wiki engine in Python.
+MoinMoin — a wiki engine written in Python.
 """
 
 
@@ -17,4 +17,4 @@
 
 
 if sys.hexversion < 0x3090000:
-    sys.exit("Error: %s requires Python 3.9+, current version is %s\n" % (project, platform.python_version()))
+    sys.exit("Error: %s requires Python 3.9 or later; current version is %s\n" % (project, platform.python_version()))
diff --git a/src/moin/_template.py b/src/moin/_template.py
index 8127a137e..011241113 100644
--- a/src/moin/_template.py
+++ b/src/moin/_template.py
@@ -2,14 +2,14 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - sourcecode header template
+MoinMoin - source code header template.
 
-Please use this template when starting a new python source file.
+Please use this template when starting a new Python source file.
 
-It is important that all sourcecode files have the same header structure,
-are correctly copyrighted and licensed and have a reasonable docstring
-explaining what the module / package does.
+It is important that all source code files have the same header structure,
+are correctly copyrighted and licensed, and have a reasonable docstring
+explaining what the module or package does.
 
-Of course you'll have to edit/fix the Copyright line and also the docstring
-needs to be replaced with something making sense, but keep the structure.
+Of course, you'll have to edit/fix the Copyright line, and the docstring
+needs to be replaced with something meaningful, but keep the structure.
 """
diff --git a/src/moin/_tests/__init__.py b/src/moin/_tests/__init__.py
index 943d06131..4bec2c80b 100644
--- a/src/moin/_tests/__init__.py
+++ b/src/moin/_tests/__init__.py
@@ -4,7 +4,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - some common code for testing
+MoinMoin - some common code for testing.
 """
 
 
@@ -17,7 +17,7 @@
 
 from moin.constants.contenttypes import CHARSET
 from moin.constants.keys import NAME, CONTENTTYPE, NAME_EXACT
-from moin.converters import include  # noqa prevent circular import
+from moin.converters import include  # noqa # prevent a circular import
 from moin.items import Item
 from moin.utils.crypto import random_string
 from moin.utils.interwiki import CompositeName
@@ -29,12 +29,12 @@
 
 
 def become_valid(username="ValidUser"):
-    """modify flaskg.user to make the user valid.
-    Note that a valid user will only be in ACL special group "Known", if
-    we have a user profile for this user as the ACL system will check if
-    there is a userid for this username.
-    Thus, for testing purposes (e.g. if you need delete rights), it is
-    easier to use become_trusted().
+    """Modify flaskg.user to make the user valid.
+
+    Note that a valid user will only be in the ACL special group "Known" if
+    we have a user profile for this user, as the ACL system will check whether
+    there is a user ID for this username. Thus, for testing purposes (e.g., if
+    you need delete rights), it is easier to use become_trusted().
     """
     flaskg.user.profile[NAME] = [username]
     flaskg.user.may.names = [username]  # see security.DefaultSecurityPolicy class
@@ -42,7 +42,7 @@ def become_valid(username="ValidUser"):
 
 
 def become_trusted(username="TrustedUser"):
-    """modify flaskg.user to make the user valid and trusted, so it is in acl group Trusted"""
+    """Modify flaskg.user to make the user valid and trusted, so it is in the ACL group "Trusted"."""
     become_valid(username)
     flaskg.user.trusted = True
 
@@ -51,7 +51,7 @@ def become_trusted(username="TrustedUser"):
 
 
 def update_item(name, meta, data):
-    """creates or updates an item"""
+    """Create or update an item."""
     if isinstance(data, str):
         data = data.encode(CHARSET)
     fqname = CompositeName("", NAME_EXACT, name)
@@ -67,13 +67,13 @@ def update_item(name, meta, data):
 
 
 def create_random_string_list(length=14, count=10):
-    """creates a list of random strings"""
+    """Create a list of random strings."""
     chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
     return [f"{random_string(length, chars)}" for counter in range(count)]
 
 
 def nuke_item(name):
-    """complete destroys an item"""
+    """Completely destroy an item."""
     item = Item.create(name)
     item.destroy()
 
@@ -82,7 +82,7 @@ def check_connection(port, host="127.0.0.1"):
     """
     Check if we can make a connection to host:port.
 
-    If not, raise Exception with a meaningful msg.
+    If not, raise an Exception with a meaningful message.
     """
     try:
         s = socket.create_connection((host, port))
@@ -93,12 +93,13 @@ def check_connection(port, host="127.0.0.1"):
 
 
 def get_dirs(subdir: str) -> tuple[Path, Path]:
-    """return Paths for directories used in tests creating artifacts_dir if needed
+    """Return Paths for directories used in tests, creating artifacts_dir if needed.
 
     :param subdir: subdirectory for artifacts_dir
     :returns: tuple (moin_dir, artifacts_dir)
-              where moin_dir is Path to moin directory, parent of src
-              and artifacts_dir is Path to moin/_test_artifacts/{subdir}"""
+              where moin_dir is the Path to the moin directory (parent of src),
+              and artifacts_dir is the Path to moin/_test_artifacts/{subdir}
+    """
     my_dir = Path(__file__).parent.resolve()
     moin_dir = my_dir.parents[2]
     artifacts_dir = moin_dir / "_test_artifacts" / subdir
@@ -108,7 +109,7 @@ def get_dirs(subdir: str) -> tuple[Path, Path]:
 
 
 def get_open_wiki_files():
-    """check if any files in wiki/data or wiki/index are in use"""
+    """Check if any files in wiki/data or wiki/index are in use."""
     proc = psutil.Process()
     files = []
     for file in proc.open_files():
diff --git a/src/moin/_tests/_test_template.py b/src/moin/_tests/_test_template.py
index a76eb29eb..c31b0559b 100644
--- a/src/moin/_tests/_test_template.py
+++ b/src/moin/_tests/_test_template.py
@@ -4,7 +4,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.module_tested Tests
+    MoinMoin - moin.module_tested tests.
 
     Module names must start with 'test_' to be included in the tests.
 """
@@ -15,7 +15,7 @@
 
 
 class TestSimpleStuff:
-    """The simplest MoinMoin test class
+    """The simplest MoinMoin test class.
 
     Class name must start with 'Test' to be included in
     the tests.
@@ -35,10 +35,10 @@ def testSimplest(self):
 
 
 class TestComplexStuff:
-    """Describe these tests here...
+    """Describe these tests here.
 
     Some tests may have a list of tests related to this test case. You
-    can add a test by adding another line to this list
+    can add a test by adding another line to this list.
     """
 
     _tests = (
@@ -52,10 +52,10 @@ class Config(wikiconfig.Config):
         foo = "bar"  # we want to have this non-default setting
 
     def setup_class(self):
-        """Stuff that should be run to init the state of this test class"""
+        """Stuff that should be run to initialize the state of this test class."""
 
     def teardown_class(self):
-        """Stuff that should run to clean up the state of this test class"""
+        """Stuff that should run to clean up the state of this test class."""
 
     def testFunction(self):
         """module_tested: function should..."""
@@ -64,9 +64,9 @@ def testFunction(self):
             assert result == expected
 
     def _helper_fuction(self, test):
-        """Some tests needs extra  work to run
+        """Some tests need extra work to run.
 
-        Keep the test non interesting details out of the way.
+        Keep the test's non-interesting details out of the way.
         """
         module_tested.do_this()
         module_tested.do_that()
diff --git a/src/moin/_tests/ldap_testbase.py b/src/moin/_tests/ldap_testbase.py
index 1b42391c5..7b4c9736a 100644
--- a/src/moin/_tests/ldap_testbase.py
+++ b/src/moin/_tests/ldap_testbase.py
@@ -2,37 +2,37 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    LDAPTestBase: LDAP testing support for pytest based unit tests
+LDAPTestBase: LDAP testing support for pytest-based unit tests.
 
-    Features
-    --------
+Features
+--------
 
-    * setup_class
-      * automatic creation of a temporary LDAP server environment
-      * automatic creation of a LDAP server process (slapd)
+* setup_class
+  * automatic creation of a temporary LDAP server environment
+  * automatic creation of an LDAP server process (slapd)
 
-    * teardown_class
-      * LDAP server process will be killed and termination will be waited for
-      * temporary LDAP environment will be removed
+* teardown_class
+  * the LDAP server process will be terminated (and we will wait for termination)
+  * the temporary LDAP environment will be removed
 
-    Usage
-    -----
+Usage
+-----
 
-    Write your own test class and derive from LDAPTestBase:
+Write your own test class and derive from LDAPTestBase:
 
-    class TestLdap(LDAPTestBase):
-        def testFunction(self):
-            server_url = self.ldap_env.slapd.url
-            lo = ldap.initialize(server_url)
-            lo.simple_bind_s('', '')
+class TestLdap(LDAPTestBase):
+    def testFunction(self):
+        server_url = self.ldap_env.slapd.url
+        lo = ldap.initialize(server_url)
+        lo.simple_bind_s('', '')
 
-    Notes
-    -----
+Notes
+-----
 
-    On Ubuntu 8.04 there is apparmor imposing some restrictions on /usr/sbin/slapd,
-    so you need to disable apparmor by invoking this as root:
+On Ubuntu 8.04 there is AppArmor imposing some restrictions on /usr/sbin/slapd,
+so you need to disable AppArmor by invoking this as root:
 
-    # /etc/init.d/apparmor stop
+# /etc/init.d/apparmor stop
 """
 
 
@@ -61,9 +61,9 @@ def testFunction(self):
 
 
 def check_environ():
-    """Check the system environment whether we are able to run.
-    Either return some failure reason if we can't or None if everything
-    looks OK.
+    """Check whether the system environment can run these tests.
+
+    Return a failure reason string if we can't, or None if everything looks OK.
     """
     if ldap is None:
         return "You need python-ldap installed to use ldap_testbase."
@@ -85,7 +85,7 @@ def check_environ():
 
 
 class Slapd:
-    """Manage a slapd process for testing purposes"""
+    """Manage a slapd process for testing purposes."""
 
     def __init__(
         self,
@@ -110,7 +110,7 @@ def __init__(
             self.service_name = service_name
 
     def start(self, timeout=0):
-        """start a slapd process and optionally wait up to timeout seconds until it responds"""
+        """Start a slapd process and optionally wait up to 'timeout' seconds until it responds."""
         args = [self.executable, "-h", self.url]
         if self.config is not None:
             args.extend(["-f", self.config])
@@ -136,14 +136,14 @@ def start(self, timeout=0):
         return started
 
     def stop(self):
-        """stop this slapd process and wait until it has terminated"""
+        """Stop this slapd process and wait until it has terminated."""
         pid = self.process.pid
         os.kill(pid, signal.SIGTERM)
         os.waitpid(pid, 0)
 
 
 class LdapEnvironment:
-    """Manage a (temporary) environment for running a slapd in it"""
+    """Manage a (temporary) environment for running a slapd."""
 
     # default DB_CONFIG bdb configuration file contents
     DB_CONFIG = """\
@@ -180,9 +180,8 @@ def __init__(
         self.timeout = timeout
 
     def create_env(self, slapd_config, db_config=DB_CONFIG):
-        """create a temporary LDAP server environment in a temp. directory,
-        including writing a slapd.conf (see configure_slapd) and a
-        DB_CONFIG there.
+        """Create a temporary LDAP server environment in a temp directory,
+        including writing a slapd.conf (see configure_slapd) and a DB_CONFIG there.
         """
         # create directories
         self.ldap_dir = tempfile.mkdtemp(prefix=f"LdapEnvironment-{self.instance}.")
@@ -212,13 +211,13 @@ def create_env(self, slapd_config, db_config=DB_CONFIG):
             f.write(slapd_config)
 
     def start_slapd(self):
-        """start a slapd and optionally wait until it talks with us"""
+        """Start a slapd and optionally wait until it responds."""
         self.slapd = Slapd(config=self.slapd_conf, port=3890 + self.instance)
         started = self.slapd.start(timeout=self.timeout)
         return started
 
     def load_directory(self, ldif_content):
-        """load the directory with the ldif_content (str)"""
+        """Load the directory with the ldif_content (str)."""
         lo = ldap.initialize(self.slapd.url)
         ldap.set_option(ldap.OPT_PROTOCOL_VERSION, ldap.VERSION3)  # ldap v2 is outdated
         lo.simple_bind_s(self.rootdn, self.rootpw)
@@ -231,11 +230,11 @@ def handle(self, dn, entry):
         loader.parse()
 
     def stop_slapd(self):
-        """stop a slapd"""
+        """Stop slapd."""
         self.slapd.stop()
 
     def destroy_env(self):
-        """remove the temporary LDAP server environment"""
+        """Remove the temporary LDAP server environment."""
         shutil.rmtree(self.ldap_dir)
 
 
@@ -243,9 +242,9 @@ def destroy_env(self):
     import pytest
 
     class LDAPTstBase:
-        """Test base class for pytest based tests which need a LDAP server to talk to.
+        """Test base class for pytest-based tests that need an LDAP server.
 
-        Inherit your test class from this base class to test LDAP stuff.
+        Inherit your test class from this base class to test LDAP functionality.
         """
 
         # You MUST define these in your derived class:
@@ -256,7 +255,7 @@ class LDAPTstBase:
         rootpw = None  # root password
 
         def setup_class(self):
-            """Create LDAP server environment, start slapd"""
+            """Create an LDAP server environment and start slapd."""
             self.ldap_env = LdapEnvironment(self.basedn, self.rootdn, self.rootpw)
             self.ldap_env.create_env(slapd_config=self.slapd_config)
             started = self.ldap_env.start_slapd()
@@ -268,7 +267,7 @@ def setup_class(self):
             self.ldap_env.load_directory(ldif_content=self.ldif_content)
 
         def teardown_class(self):
-            """Stop slapd, remove LDAP server environment"""
+            """Stop slapd and remove the LDAP server environment."""
             self.ldap_env.stop_slapd()
             self.ldap_env.destroy_env()
 
diff --git a/src/moin/_tests/ldap_testdata.py b/src/moin/_tests/ldap_testdata.py
index c309faa9f..9545a3b59 100644
--- a/src/moin/_tests/ldap_testdata.py
+++ b/src/moin/_tests/ldap_testdata.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - LDAP test data
+MoinMoin - LDAP test data.
 """
 
 
@@ -86,7 +86,7 @@
 objectClass: account
 objectClass: simpleSecurityObject
 uid: usera
-# this is md5 encoded 'usera' for password
+# This is MD5-encoded 'usera' for the password
 userPassword: {MD5}aXqgOSc5gSW7YoLi9BSmvg==
 
 dn: uid=userb,ou=Unit B,ou=Users,ou=testing,dc=example,dc=org
@@ -94,7 +94,7 @@
 objectClass: inetOrgPerson
 sn: Nachname
 uid: userb
-# this is md5 encoded 'userb' for password
+# This is MD5-encoded 'userb' for the password
 userPassword: {MD5}ThvfQsM7OQFjqSUQOX2XsA==
 
 dn: cn=Group A,ou=Groups,ou=testing,dc=example,dc=org
diff --git a/src/moin/_tests/test_error.py b/src/moin/_tests/test_error.py
index 974ad9669..9e7c4b078 100644
--- a/src/moin/_tests/test_error.py
+++ b/src/moin/_tests/test_error.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.error Tests
+MoinMoin - moin.error tests.
 """
 
 
@@ -11,15 +11,15 @@
 
 
 class TestEncoding:
-    """MoinMoin errors do work with unicode transparently"""
+    """MoinMoin errors work with Unicode transparently."""
 
     def testCreateWithUnicode(self):
-        """error: create with unicode"""
+        """error: create with Unicode"""
         err = error.Error("טעות")
         assert str(err) == "טעות"
 
     def testCreateWithEncodedString(self):
-        """error: create with encoded string"""
+        """error: create with an encoded string"""
         err = error.Error("טעות".encode())
         assert str(err) == "טעות"
 
@@ -34,7 +34,7 @@ def __str__(self):
         assert str(err) == "טעות"
 
     def testAccessLikeDict(self):
-        """error: access error like a dict"""
+        """error: access the error like a dict"""
         test = "value"
         err = error.Error(test)
         assert "%(message)s" % dict(message=err) == test
diff --git a/src/moin/_tests/test_forms.py b/src/moin/_tests/test_forms.py
index 6f285646d..83aeeeaad 100644
--- a/src/moin/_tests/test_forms.py
+++ b/src/moin/_tests/test_forms.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.forms Tests
+    MoinMoin - moin.forms tests.
 """
 
 import datetime
@@ -55,7 +55,7 @@ def test_validjson():
     """
     Tests for changes to metadata when modifying an item.
 
-    Does not apply to usersettings form.
+    Does not apply to the user settings form.
     """
     app.cfg.namespace_mapping = [("", "default_backend"), ("ns1", "default_backend"), ("users", "other_backend")]
     item = Item.create("users/existingname")
diff --git a/src/moin/_tests/test_test_environ.py b/src/moin/_tests/test_test_environ.py
index 6b370a3d4..cf982868c 100644
--- a/src/moin/_tests/test_test_environ.py
+++ b/src/moin/_tests/test_test_environ.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - Tests for our test environment
+    MoinMoin - tests for our test environment.
 """
 
 from io import BytesIO
diff --git a/src/moin/_tests/test_user.py b/src/moin/_tests/test_user.py
index 854ea3d6c..29979ddc2 100644
--- a/src/moin/_tests/test_user.py
+++ b/src/moin/_tests/test_user.py
@@ -4,7 +4,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.user Tests
+    MoinMoin - moin.user tests.
 """
 
 
@@ -50,7 +50,7 @@ def saved_user(self):
     # Passwords / Login -----------------------------------------------
 
     def testAsciiPassword(self):
-        """user: login with ascii password"""
+        """User: login with ASCII password."""
         # Create test user
         name = "__Non Existent User Name__"
         password = name
@@ -61,7 +61,7 @@ def testAsciiPassword(self):
         assert theUser.valid
 
     def testUnicodePassword(self):
-        """user: login with non-ascii password"""
+        """User: login with non-ASCII password."""
         # Create test user
         name = "__שם משתמש לא קיים__"  # Hebrew
         password = name
@@ -72,7 +72,7 @@ def testUnicodePassword(self):
         assert theUser.valid
 
     def testInvalidatePassword(self):
-        """user: test invalidation of password"""
+        """User: test invalidation of password."""
         # Create test user
         name = "__Non Existent User Name__"
         password = name
@@ -82,8 +82,8 @@ def testInvalidatePassword(self):
         theUser = user.User(name=name, password=password)
         assert theUser.valid
 
-        # invalidate the stored password (hash)
-        theUser.set_password("")  # emptry str or None means "invalidate"
+        # Invalidate the stored password (hash)
+        theUser.set_password("")  # empty str or None means "invalidate"
         theUser.save()
 
         # Try to "login" with previous password
@@ -96,8 +96,8 @@ def testInvalidatePassword(self):
 
     def testPasswordHash(self):
         """
-        Create user, set a specific pw hash and check that user can login
-        with the correct password and can not log in with a wrong password.
+        Create a user, set a specific password hash, and check that the user can log in
+        with the correct password and cannot log in with a wrong password.
         """
         # Create test user
         name = "Test User"
@@ -176,7 +176,7 @@ def test_bookmark(self):
 
     def test_quicklinks(self):
         """
-        Test for the quicklinks
+        Test quicklinks.
         """
         pagename = "Test_page_quicklink"
         name = "Test_User_quicklink"
@@ -272,7 +272,7 @@ def createUser(self, name, password, pwencoded=False, email=None, validate=False
 class TestGroupName:
 
     def testGroupNames(self):
-        """user: isValidName: reject group names"""
+        """User: isValidName: reject group names."""
         test = "AdminGroup"
         assert not user.isValidName(test)
 
@@ -280,9 +280,9 @@ def testGroupNames(self):
 class TestIsValidName:
 
     def testNonAlnumCharacters(self):
-        """user: isValidName: reject unicode non alpha numeric characters
+        """User: isValidName: reject Unicode non-alphanumeric characters.
 
-        : and , used in acl rules, we might add more characters to the syntax.
+        ':' and ',' are used in ACL rules; we might add more characters to the syntax.
         """
         invalid = '! # $ % ^ & * ( ) = + , : ; " | ~ / \\ \u0000 \u202a'.split()
         base = "User{0}Name"
@@ -291,13 +291,13 @@ def testNonAlnumCharacters(self):
             assert not user.isValidName(name)
 
     def testWhitespace(self):
-        """user: isValidName: reject leading, trailing or multiple whitespace"""
+        """User: isValidName: reject leading, trailing, or multiple whitespace."""
         cases = (" User Name", "User Name ", "User   Name")
         for test in cases:
             assert not user.isValidName(test)
 
     def testValid(self):
-        """user: isValidName: accept names in any language, with spaces"""
+        """User: isValidName: accept names in any language, with spaces."""
         cases = (
             "Jürgen Hermann",  # German
             "ניר סופר",  # Hebrew
diff --git a/src/moin/_tests/test_views.py b/src/moin/_tests/test_views.py
index a8ebe78fd..119692449 100644
--- a/src/moin/_tests/test_views.py
+++ b/src/moin/_tests/test_views.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.views Tests
+MoinMoin - moin.views tests.
 """
 
 from moin.apps.frontend.views import parse_scoped_query
diff --git a/src/moin/_tests/test_wikiutil.py b/src/moin/_tests/test_wikiutil.py
index a121e4124..f6305c07f 100644
--- a/src/moin/_tests/test_wikiutil.py
+++ b/src/moin/_tests/test_wikiutil.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.wikiutil Tests
+    MoinMoin - moin.wikiutil tests.
 """
 
 from __future__ import annotations
@@ -86,9 +86,9 @@ def test_rel_pagename(self, current_page, relative_page, absolute_page):
 class TestNormalizePagename:
 
     def testPageInvalidChars(self):
-        """request: normalize pagename: remove invalid unicode chars
+        """Request: normalize pagename: remove invalid Unicode chars.
 
-        Assume the default setting
+        Assume the default setting.
         """
         test = "\u0000\u202a\u202b\u202c\u202d\u202e"
         expected = ""
@@ -96,7 +96,7 @@ def testPageInvalidChars(self):
         assert result == expected
 
     def testNormalizeSlashes(self):
-        """request: normalize pagename: normalize slashes"""
+        """Request: normalize pagename: normalize slashes."""
         cases = (
             ("/////", ""),
             ("/a", "a"),
@@ -109,7 +109,7 @@ def testNormalizeSlashes(self):
             assert result == expected
 
     def testNormalizeWhitespace(self):
-        """request: normalize pagename: normalize whitespace"""
+        """Request: normalize pagename: normalize whitespace."""
         cases = (
             ("         ", ""),
             ("    a", "a"),
@@ -124,10 +124,10 @@ def testNormalizeWhitespace(self):
             assert result == expected
 
     def testUnderscoreTestCase(self):
-        """request: normalize pagename: underscore convert to spaces and normalized
+        """Request: normalize pagename: convert underscores to spaces and normalize whitespace.
 
         Underscores should convert to spaces, then spaces should be
-        normalized, order is important!
+        normalized; order is important!
         """
         cases = (
             ("         ", ""),
@@ -144,14 +144,14 @@ def testUnderscoreTestCase(self):
 class TestGroupItems:
 
     def testNormalizeGroupName(self):
-        """request: normalize itemname: restrict groups to alpha numeric Unicode
+        """Request: normalize itemname: restrict groups to alphanumeric Unicode.
 
-        Spaces should normalize after invalid chars removed!
+        Spaces should be normalized after invalid chars are removed!
         """
         cases = (
-            # current acl chars
+            # current ACL chars
             ("Name,:Group", "NameGroup"),
-            # remove than normalize spaces
+            # remove then normalize spaces
             ("Name ! @ # $ % ^ & * ( ) + Group", "Name Group"),
         )
         for test, expected in cases:
@@ -218,8 +218,8 @@ def testcontainsConflictMarker():
 
 def testsplit_anchor():
     """
-    TODO: add the test for for split_anchor when we have better
-          approach to deal wih problems like "#MoinMoin#" returning ("#MoinMoin", "")
+    TODO: add a test for split_anchor when we have a better
+          approach to deal with problems like "#MoinMoin#" returning ("#MoinMoin", "")
     """
     result = wikiutil.split_anchor("MoinMoin")
     expected = "MoinMoin", ""
diff --git a/src/moin/_tests/wiki/data/plugin/__init__.py b/src/moin/_tests/wiki/data/plugin/__init__.py
index acd7bc9fc..a7734bc46 100644
--- a/src/moin/_tests/wiki/data/plugin/__init__.py
+++ b/src/moin/_tests/wiki/data/plugin/__init__.py
@@ -1,3 +1,3 @@
 """
-This file was added so as to make git track the folders necessary for the tests.
+This file was added to make Git track the folders necessary for the tests.
 """
diff --git a/src/moin/_tests/wikiconfig.py b/src/moin/_tests/wikiconfig.py
index 4ab2b53d9..48bec262a 100644
--- a/src/moin/_tests/wikiconfig.py
+++ b/src/moin/_tests/wikiconfig.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - test wiki configuration
+MoinMoin - Test wiki configuration.
 
 Do not change any values without good reason.
 
@@ -18,9 +18,7 @@
 
 
 class Config(DefaultConfig):
-    """
-    default configuration for the unit tests
-    """
+    """Default configuration for unit tests."""
 
     _here = abspath(dirname(__file__))
     _root = abspath(join(_here, "..", ".."))
diff --git a/src/moin/app.py b/src/moin/app.py
index 7c5577588..ee8ab03a3 100644
--- a/src/moin/app.py
+++ b/src/moin/app.py
@@ -6,7 +6,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - wsgi application setup and related code
+MoinMoin - WSGI application setup and related code.
 
 Use create_app(config) to create the WSGI application (using Flask).
 """
@@ -52,7 +52,7 @@
 
 def create_app(config: str | PathLike[str] | None = None) -> Flask:
     """
-    simple wrapper around create_app_ext()
+    Simple wrapper around create_app_ext().
     """
     return create_app_ext(flask_config_file=config)
 
@@ -65,21 +65,20 @@ def create_app_ext(
     **kwargs,
 ) -> Flask:
     """
-    Factory for moin wsgi apps
+    Factory for Moin WSGI apps.
 
-    :param flask_config_file: a flask config file name (may have a MOINCFG class),
-                              if not given, a config pointed to by MOINCFG env var
+    :param flask_config_file: A Flask config file name (may define a MOINCFG class).
+                              If not given, a config pointed to by the MOINCFG env var
                               will be loaded (if possible).
-    :param flask_config_dict: a dict used to update flask config (applied after
-                              flask_config_file was loaded [if given])
-    :param moin_config_class: if you give this, it'll be instantiated as app.cfg,
-                              otherwise it'll use MOINCFG from flask config. If that
-                              also is not there, it'll use the DefaultConfig built
-                              into MoinMoin.
-    :param warn_default: emit a warning if moin falls back to its builtin default
-                         config (maybe user forgot to specify MOINCFG?)
-    :param kwargs: if you give additional keyword args, the keys/values will get patched
-                   into the moin configuration class (before its instance is created)
+    :param flask_config_dict: A dict used to update the Flask config (applied after
+                              flask_config_file was loaded, if given).
+    :param moin_config_class: If given, this class is instantiated as app.cfg;
+                              otherwise, MOINCFG from the Flask config is used. If that
+                              is also not present, the built-in DefaultConfig will be used.
+    :param warn_default: Emit a warning if Moin falls back to its built-in default
+                         config (perhaps the user forgot to specify MOINCFG?).
+    :param kwargs: Additional keyword args will be patched into the Moin configuration
+                   class (before its instance is created).
     """
     clock = Clock()
     clock.start("create_app total")
@@ -94,7 +93,7 @@ def create_app_ext(
     else:
         cmd_name = ""
     logging.debug("info_name: %s cmd_name: %s", info_name, cmd_name)
-    # help don't need config or backend and should run independent of a valid wiki instance
+    # Help doesn't need config or backend and should run independently of a valid wiki instance
     # moin --help results in info_name=moin and cmd_name=cli
     if (info_name == "moin" and cmd_name == "cli") or info_name == "help":
         return app
@@ -169,7 +168,7 @@ class ItemNameConverter(PathConverter):
 
     app.register_blueprint(serve, url_prefix="/+serve")
 
-    # create wiki link analyzer after having registered all routes
+    # Create WikiLink analyzer after having registered all routes
     app.link_analyzer = WikiLinkAnalyzer(app)
 
     clock.stop("create_app register")
@@ -179,7 +178,7 @@ class ItemNameConverter(PathConverter):
     cache.init_app(app)
     app.cache = cache
     clock.stop("create_app flask-cache")
-    # init storage
+    # Initialize storage
     clock.start("create_app init backends")
     # start init_backends
     _init_backends(app, info_name, clock)
@@ -195,7 +194,7 @@ class ItemNameConverter(PathConverter):
     app.register_error_handler(403, themed_error)
     app.cfg.custom_css_path = os.path.isfile("wiki_local/custom.css")
     clock.stop("create_app flask-theme")
-    # create global counter to limit content security policy reports, prevent spam
+    # Create a global counter to limit Content Security Policy reports and prevent spam
     app.csp_count = 0
     app.csp_last_date = ""
     clock.stop("create_app total")
diff --git a/src/moin/apps/__init__.py b/src/moin/apps/__init__.py
index 049cc40ed..2e21164d8 100644
--- a/src/moin/apps/__init__.py
+++ b/src/moin/apps/__init__.py
@@ -2,12 +2,12 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - flask modules for better modularization
+MoinMoin - Flask application modules
 
-This package contains some Flask Modules:
+This package contains the following Flask blueprints:
 
-- frontend has all usual wiki user interface code
-- feed Module for all feed-like stuff
-- admin Module for special stuff for wiki admins
-- serve Module for static file serving
+- frontend: the user-facing wiki interface
+- feed: feed-related functionality
+- admin: administrative views for wiki administrators
+- serve: static file serving
 """
diff --git a/src/moin/apps/admin/__init__.py b/src/moin/apps/admin/__init__.py
index 1baa32bc9..e282f47fa 100644
--- a/src/moin/apps/admin/__init__.py
+++ b/src/moin/apps/admin/__init__.py
@@ -2,9 +2,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - admin views package
+MoinMoin - Admin views package
 
-    This package contains all views, templates, static files for wiki administration.
+This package contains the views, templates, and static files for wiki administration.
 """
 
 
diff --git a/src/moin/apps/admin/_tests/test_admin.py b/src/moin/apps/admin/_tests/test_admin.py
index fb40c20f6..13cd3fdde 100644
--- a/src/moin/apps/admin/_tests/test_admin.py
+++ b/src/moin/apps/admin/_tests/test_admin.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details
 
 """
-    MoinMoin - admin view tests
+MoinMoin - Tests for admin views
 """
 
 from flask import url_for
diff --git a/src/moin/apps/admin/views.py b/src/moin/apps/admin/views.py
index 93562525b..1f4f32528 100644
--- a/src/moin/apps/admin/views.py
+++ b/src/moin/apps/admin/views.py
@@ -8,9 +8,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - admin views
+MoinMoin - Admin views
 
-This shows the user interface for wiki admins.
+This module provides the user interface for wiki administrators.
 """
 from collections import namedtuple
 
@@ -74,7 +74,7 @@ def index():
 
 
 @admin.route("/user")
-# wip - see #1734, this fix breaks the user view from the navigation bar.
+# WIP: see #1734; this fix breaks the user view from the navigation bar.
 # @require_permission(SUPERUSER)
 def index_user():
     return render_template(
@@ -242,7 +242,7 @@ def userprofile(user_name):
 @require_permission(SUPERUSER)
 def mail_recovery_token():
     """
-    Send user an email so he can reset his password.
+    Send the user an email so they can reset their password.
     """
     username = request.form.get("username", "")
     if username:
@@ -362,7 +362,7 @@ def format_default(default):
 @admin.route("/highlighterhelp", methods=["GET"])
 @require_permission(SUPERUSER)
 def highlighterhelp():
-    """display a table with list of available Pygments lexers"""
+    """Display a table listing the available Pygments lexers."""
     import pygments.lexers
 
     headings = [_("Lexer description"), _("Lexer names"), _("File patterns"), _("Mimetypes")]
@@ -379,7 +379,7 @@ def highlighterhelp():
 @admin.route("/interwikihelp", methods=["GET"])
 @require_permission(SUPERUSER)
 def interwikihelp():
-    """display a table with list of known interwiki names / urls"""
+    """Display a table listing the known InterWiki names and URLs."""
     headings = [_("InterWiki name"), _("URL")]
     rows = sorted(app.cfg.interwiki_map.items())
     return render_template("user/interwikihelp.html", title_name=_("Interwiki Names"), headings=headings, rows=rows)
@@ -388,7 +388,7 @@ def interwikihelp():
 @admin.route("/itemsize", methods=["GET"])
 @require_permission(SUPERUSER)
 def itemsize():
-    """display a table with item sizes"""
+    """Display a table with item sizes."""
     headings = [_("Size"), _("Item name")]
     query = And([Not(Term(NAMESPACE, NAMESPACE_USERPROFILES)), Not(Term(TRASH, True))])
     revs = flaskg.storage.search_meta(query, idx_name=LATEST_REVS, sortedby=[NAME], limit=None)
@@ -471,7 +471,7 @@ def user_acl_report(uid):
 @require_permission(SUPERUSER)
 def groupbrowser():
     """
-    Display list of all groups and their members
+    Display a list of all groups and their members.
     """
     all_groups = flaskg.groups
     groups = []
@@ -496,7 +496,7 @@ def groupbrowser():
 @require_permission(SUPERUSER)
 def item_acl_report():
     """
-    Return a sorted list of all items in the wiki along with the ACL Meta-data.
+    Return a sorted list of all items in the wiki along with the ACL metadata.
 
     Item names are prefixed with the namespace, if there is a non-default namespace.
     If there are multiple names, the first name is used for sorting.
diff --git a/src/moin/apps/feed/__init__.py b/src/moin/apps/feed/__init__.py
index ee12406c0..122e5ce96 100644
--- a/src/moin/apps/feed/__init__.py
+++ b/src/moin/apps/feed/__init__.py
@@ -2,10 +2,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - feed views package
+MoinMoin - Feed views package
 
-    This package contains all views, templates, static files for feeds
-    (like atom, ...).
+This package contains the views, templates, and static files for feeds (e.g., Atom).
 """
 
 
diff --git a/src/moin/apps/feed/_tests/test_feed.py b/src/moin/apps/feed/_tests/test_feed.py
index 50dd08928..b0c6a987b 100644
--- a/src/moin/apps/feed/_tests/test_feed.py
+++ b/src/moin/apps/feed/_tests/test_feed.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - basic tests for feeds
+MoinMoin - Tests for feeds
 """
 
 from flask import url_for
@@ -31,7 +31,7 @@ def test_global_atom_with_an_item(self, app):
             assert rv.data.startswith(b"<?xml")
             assert b"foo data for feed item" in rv.data
 
-        # tests the cache invalidation
+        # Test cache invalidation
         update_item(basename, {COMMENT: "checking if the cache invalidation works"}, "")
         with app.test_client() as c:
             rv = c.get(url_for("feed.atom"))
diff --git a/src/moin/apps/feed/views.py b/src/moin/apps/feed/views.py
index 97038679e..bb387421d 100644
--- a/src/moin/apps/feed/views.py
+++ b/src/moin/apps/feed/views.py
@@ -4,9 +4,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - feed views
+MoinMoin - Feed views
 
-    This contains all sort of feeds.
+This module provides feed endpoints (e.g., Atom).
 """
 
 
@@ -36,12 +36,12 @@
 @feed.route("/atom", defaults=dict(item_name=""))
 def atom(item_name):
     """
-    Currently atom feeds behave in the following way
-    - Text diffs are shown in a side-by-side fashion
-    - The current binary item is fully rendered in the feed
-    - Image(binary)'s diff is shown using PIL
-    - First item is always rendered fully
-    - Revision meta(id, size and comment) is shown for parent and current revision
+    Atom feeds currently behave in the following way:
+    - Text diffs are shown side by side.
+    - The current binary item is fully rendered in the feed.
+    - Image (binary) diffs are shown using PIL.
+    - The first item is always rendered fully.
+    - Revision metadata (ID, size, and comment) is shown for the parent and current revision.
     """
     query = Every()
     if item_name:
@@ -85,7 +85,7 @@ def atom(item_name):
                         previous_rev, this_rev, fqname=this_rev.item.fqname
                     )
                 else:
-                    # full html rendering for new items
+                    # Full HTML rendering for new items
                     content = render_template(
                         "atom.html",
                         get="first_revision",
diff --git a/src/moin/apps/frontend/__init__.py b/src/moin/apps/frontend/__init__.py
index 76a35e75e..9d16ead9d 100644
--- a/src/moin/apps/frontend/__init__.py
+++ b/src/moin/apps/frontend/__init__.py
@@ -2,10 +2,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - frontend views package
+MoinMoin - Frontend views package
 
-    This package contains all views, templates, static files that a normal wiki
-    user usually sees.
+This package contains the views, templates, and static files that a typical wiki user sees.
 """
 
 
diff --git a/src/moin/apps/frontend/_tests/test_frontend.py b/src/moin/apps/frontend/_tests/test_frontend.py
index 3f6a03084..fcfc8ed92 100644
--- a/src/moin/apps/frontend/_tests/test_frontend.py
+++ b/src/moin/apps/frontend/_tests/test_frontend.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - basic tests for frontend
+MoinMoin - Tests for frontend
 """
 
 from io import BytesIO
@@ -192,7 +192,7 @@ def test_history(self):
         self._test_view("frontend.history", status="404 NOT FOUND", viewopts=dict(item_name="DoesntExist"))
 
     def test_diff(self):
-        # TODO another test with valid rev1 and rev2 url args and an existing item is needed
+        # TODO: Add another test with valid rev1 and rev2 URL args and an existing item.
         self._test_view("frontend.diff", status="404 NOT FOUND", viewopts=dict(item_name="DoesntExist"))
 
     def test_similar_names(self):
@@ -260,16 +260,16 @@ def test_logout(self):
         self._test_view("frontend.logout", status="302 FOUND", data=["<!doctype html"])
 
     def test_usersettings_notloggedin(self):
-        # if a anon user visits usersettings view, he'll get redirected to the login view
+        # If an anonymous user visits the usersettings view, they will be redirected to the login view.
         self._test_view("frontend.usersettings", status="302 FOUND", data=["<!doctype html"])
 
-    # TODO: implement test_usersettings_loggedin()
+    # TODO: Implement test_usersettings_loggedin().
 
     def test_bookmark(self):
         self._test_view("frontend.bookmark", status="302 FOUND", data=["<!doctype html"])
 
     def test_diffraw(self):
-        # TODO another test with valid rev1 and rev2 url args and an existing item is needed
+        # TODO: Add another test with valid rev1 and rev2 URL args and an existing item.
         self._test_view("frontend.diffraw", status="404 NOT FOUND", data=[], viewopts=dict(item_name="DoesntExist"))
 
     def test_global_tags(self):
@@ -277,7 +277,7 @@ def test_global_tags(self):
 
 
 class TestUsersettings:
-    reinit_storage = True  # avoid username / email collisions
+    reinit_storage = True  # Avoid username/email collisions.
 
     @pytest.fixture(autouse=True)
     def custom_setup(self, app):
diff --git a/src/moin/apps/frontend/views.py b/src/moin/apps/frontend/views.py
index ae38a950c..7839b7167 100644
--- a/src/moin/apps/frontend/views.py
+++ b/src/moin/apps/frontend/views.py
@@ -10,9 +10,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - frontend views
+MoinMoin - Frontend views
 
-    This shows the usual things users see when using the wiki.
+Views that render the pages and actions a typical wiki user sees.
 """
 
 
diff --git a/src/moin/apps/misc/__init__.py b/src/moin/apps/misc/__init__.py
index fd7af9ee3..531ee7d4d 100644
--- a/src/moin/apps/misc/__init__.py
+++ b/src/moin/apps/misc/__init__.py
@@ -2,9 +2,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - misc. views package
+MoinMoin - Miscellaneous views package
 
-    This package contains misc. stuff that doesn't fit into another view category.
+This package contains miscellaneous views that do not fit into another category.
 """
 
 
diff --git a/src/moin/apps/misc/_tests/test_misc.py b/src/moin/apps/misc/_tests/test_misc.py
index 9802e0b62..75bf45695 100644
--- a/src/moin/apps/misc/_tests/test_misc.py
+++ b/src/moin/apps/misc/_tests/test_misc.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - basic tests for misc views
+MoinMoin - Tests for misc views
 """
 
 from flask import url_for
diff --git a/src/moin/apps/misc/views.py b/src/moin/apps/misc/views.py
index fcc3005d8..c8322f832 100644
--- a/src/moin/apps/misc/views.py
+++ b/src/moin/apps/misc/views.py
@@ -3,9 +3,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - miscellaneous views
+MoinMoin - Miscellaneous views
 
-    Misc. stuff that doesn't fit into another view category.
+Miscellaneous views that do not fit into another category.
 """
 
 import time
@@ -26,8 +26,8 @@
 @misc.route("/sitemap")
 def sitemap():
     """
-    XML sitemap for search engines
-    see https://www.sitemaps.org for usage details
+    XML sitemap for search engines.
+    See https://www.sitemaps.org for usage details.
     """
 
     def format_timestamp(t):
@@ -66,13 +66,13 @@ def format_timestamp(t):
 @misc.route("/urls_names")
 def urls_names():
     """
-    List of all item URLs and names, e.g. for sisteritems.
+    List of all item URLs and names, e.g., for SisterWiki.
 
-    This view generates a list of item URLs and item names, so that other wikis
+    This view generates a list of item URLs and item names so that other wikis
     can implement SisterWiki functionality easily.
-    See: http://meatballwiki.org/wiki/SisterSitesImplementationGuide
+    See http://meatballwiki.org/wiki/SisterSitesImplementationGuide
     """
-    # XXX we currently also get deleted items, fix this
+    # TODO: We currently also get deleted items; fix this.
     fq_names = []
     for rev in flaskg.storage.documents():
         fq_names += [fqname for fqname in rev.fqnames]
diff --git a/src/moin/apps/serve/__init__.py b/src/moin/apps/serve/__init__.py
index 3c11d8d67..202117e03 100644
--- a/src/moin/apps/serve/__init__.py
+++ b/src/moin/apps/serve/__init__.py
@@ -2,11 +2,11 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - serve (external) static files
+MoinMoin - Serve external static files
 
-    E.g. javascript based drawing or html editors.
-    We want to avoid bundling them, thus we access them somewhere on the
-    filesystem outside of moin.
+For example, JavaScript-based drawing or HTML editors.
+We avoid bundling them; instead, we access them somewhere on the
+filesystem outside of Moin.
 """
 
 
diff --git a/src/moin/apps/serve/_tests/test_serve.py b/src/moin/apps/serve/_tests/test_serve.py
index 867f704d2..ed10dd803 100644
--- a/src/moin/apps/serve/_tests/test_serve.py
+++ b/src/moin/apps/serve/_tests/test_serve.py
@@ -2,7 +2,7 @@
 # License: GNU GPL V2 (or any later version), see LICENSE.txt for details
 
 """
-    MoinMoin - tests for "serve" app
+MoinMoin - Tests for the serve app
 """
 
 from flask import url_for
diff --git a/src/moin/apps/serve/views.py b/src/moin/apps/serve/views.py
index dccd312b5..a364ff908 100644
--- a/src/moin/apps/serve/views.py
+++ b/src/moin/apps/serve/views.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - external static file serving
+MoinMoin - External static file serving
 """
 
 
@@ -20,7 +20,7 @@
 
 @serve.route("/")
 def index():
-    # show what we have (but not where in the filesystem)
+    # Show what we have (but not where in the filesystem).
     content = "\n".join(app.cfg.serve_files.keys())
     return Response(content, content_type="text/plain")
 
diff --git a/src/moin/auth/__init__.py b/src/moin/auth/__init__.py
index 5f2d663b3..73e2298b8 100644
--- a/src/moin/auth/__init__.py
+++ b/src/moin/auth/__init__.py
@@ -7,7 +7,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - modular authentication handling
+MoinMoin - modular authentication handling.
 
 Each authentication method is an object instance containing
 four methods:
@@ -31,7 +31,7 @@
     multistage: boolean indicating multistage login continuation
                 [may not be present, login only]
 
-login_hint() should return a HTML text that is displayed to the user right
+login_hint() should return an HTML text that is displayed to the user right
 below the login form, it should tell the user what to do in case of a
 forgotten password and how to create an account (if applicable.)
 
diff --git a/src/moin/auth/_tests/test_auth.py b/src/moin/auth/_tests/test_auth.py
index a93507b6e..d6a13e4e7 100644
--- a/src/moin/auth/_tests/test_auth.py
+++ b/src/moin/auth/_tests/test_auth.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Test for auth.__init__
+Tests for auth.__init__.
 """
 
 from flask import g as flaskg
diff --git a/src/moin/auth/_tests/test_http.py b/src/moin/auth/_tests/test_http.py
index eb3746b2e..aeb654c2c 100644
--- a/src/moin/auth/_tests/test_http.py
+++ b/src/moin/auth/_tests/test_http.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Test for auth.http
+Tests for auth.http.
 """
 
 from flask import g as flaskg
@@ -17,7 +17,7 @@
 
 
 class TestHTTPAuthMoin:
-    """Test: HTTPAuthMoin"""
+    """Tests for HTTPAuthMoin."""
 
     @pytest.fixture(autouse=True)
     def custom_setup(self):
diff --git a/src/moin/auth/_tests/test_ldap_login.py b/src/moin/auth/_tests/test_ldap_login.py
index c73609304..0e34cc3e3 100644
--- a/src/moin/auth/_tests/test_ldap_login.py
+++ b/src/moin/auth/_tests/test_ldap_login.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.auth.ldap Tests
+    MoinMoin - moin.auth.ldap tests.
 """
 
 
@@ -55,7 +55,7 @@ def cfg(self):
         class Config(wikiconfig.Config):
             from moin.auth.ldap_login import LDAPAuth
 
-            # ToDo get these vars from the test environment
+            # TODO: get these vars from the test environment
             server_uri = "ldap://127.0.0.1:3890"
             base_dn = "ou=testing,dc=example,dc=org"
             ldap_auth1 = LDAPAuth(server_uri=server_uri, base_dn=base_dn, autocreate=True)
@@ -102,7 +102,7 @@ class Config(wikiconfig.Config):
             from moin.auth.ldap_login import LDAPAuth
             from moin.auth import MoinAuth
 
-            # ToDo get these vars from the test environment
+            # TODO: get these vars from the test environment
             server_uri = "ldap://127.0.0.1:3890"
             base_dn = "ou=testing,dc=example,dc=org"
             ldap_auth = LDAPAuth(server_uri=server_uri, base_dn=base_dn, autocreate=True)
@@ -112,7 +112,7 @@ class Config(wikiconfig.Config):
         return Config
 
     def teardown_class(self):
-        """Stop slapd, remove LDAP server environment"""
+        """Stop slapd and remove the LDAP server environment."""
         self.ldap_env.stop_slapd()
         self.ldap_env.destroy_env()
 
@@ -151,7 +151,7 @@ class TestTwoLdapServers:
     ldif_content = LDIF_CONTENT
 
     def setup_class(self):
-        """Create LDAP servers environment, start slapds"""
+        """Create LDAP server environments and start slapds."""
         self.ldap_envs = []
         for instance in range(2):
             ldap_env = LdapEnvironment(self.basedn, self.rootdn, self.rootpw, instance=instance)
@@ -166,7 +166,7 @@ def setup_class(self):
             self.ldap_envs.append(ldap_env)
 
     def teardown_class(self):
-        """Stop slapd, remove LDAP server environment"""
+        """Stop slapd and remove the LDAP server environment."""
         for ldap_env in self.ldap_envs:
             ldap_env.stop_slapd()
             ldap_env.destroy_env()
@@ -193,7 +193,7 @@ class TestLdapFailover:
     ldif_content = LDIF_CONTENT
 
     def setup_class(self):
-        """Create LDAP servers environment, start slapds"""
+        """Create LDAP server environments and start slapds."""
         self.ldap_envs = []
         for instance in range(2):
             ldap_env = LdapEnvironment(self.basedn, self.rootdn, self.rootpw, instance=instance)
@@ -212,7 +212,7 @@ def cfg(self):
         class Config(wikiconfig.Config):
             from moin.auth.ldap_login import LDAPAuth
 
-            # ToDo get these vars from the test environment
+            # TODO: get these vars from the test environment
             server_uri = "ldap://127.0.0.1:3891"
             base_dn = "ou=testing,dc=example,dc=org"
             ldap_auth1 = LDAPAuth(server_uri=server_uri, base_dn=base_dn, name="ldap1", autocreate=True, timeout=1)
@@ -224,12 +224,12 @@ class Config(wikiconfig.Config):
         return Config
 
     def teardown_class(self):
-        """Stop slapd, remove LDAP server environment"""
+        """Stop slapd and remove the LDAP server environment."""
         for ldap_env in self.ldap_envs:
             try:
                 ldap_env.stop_slapd()
-            except:  # noqa
-                pass  # one will fail, because it is already stopped
+            except Exception:  # noqa
+                pass  # One will fail, because it is already stopped
             ldap_env.destroy_env()
 
     def testMoinLDAPFailOver(self):
diff --git a/src/moin/auth/_tests/test_log.py b/src/moin/auth/_tests/test_log.py
index 53f5197b6..670c5c3a6 100644
--- a/src/moin/auth/_tests/test_log.py
+++ b/src/moin/auth/_tests/test_log.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Test for auth.log
+Tests for auth.log.
 """
 
 
@@ -17,7 +17,7 @@
 
 
 class TestAuthLog:
-    """Test: TestAuthLog"""
+    """Tests for AuthLog."""
 
     def test_login(self):
         authlog_obj = AuthLog()
diff --git a/src/moin/auth/http.py b/src/moin/auth/http.py
index 3370a3c68..ea19b1a65 100644
--- a/src/moin/auth/http.py
+++ b/src/moin/auth/http.py
@@ -2,18 +2,18 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - http authentication
+MoinMoin - HTTP authentication.
 
-    HTTPAuthMoin
-    ============
+HTTPAuthMoin
+============
 
-    HTTPAuthMoin is HTTP auth done by moin (not by your web server).
+HTTPAuthMoin is HTTP auth handled by Moin (not by your web server).
 
-    Moin will request HTTP Basic Auth and use the HTTP Basic Auth header it
-    receives to authenticate username/password against the moin user profiles.
+Moin will request HTTP Basic Auth and use the HTTP Basic Auth header it
+receives to authenticate the username/password against the Moin user profiles.
 
-    from moin.auth.http import HTTPAuthMoin
-    auth = [HTTPAuthMoin()]
+from moin.auth.http import HTTPAuthMoin
+auth = [HTTPAuthMoin()]
 """
 
 
@@ -29,7 +29,7 @@
 
 
 class HTTPAuthMoin(BaseAuth):
-    """authenticate via http (basic) auth"""
+    """Authenticate via HTTP Basic Auth."""
 
     name = "http"
 
diff --git a/src/moin/auth/ldap_login.py b/src/moin/auth/ldap_login.py
index e5777544b..e6ff7adca 100644
--- a/src/moin/auth/ldap_login.py
+++ b/src/moin/auth/ldap_login.py
@@ -4,18 +4,18 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - LDAP / Active Directory authentication
+MoinMoin - LDAP / Active Directory authentication.
 
-    This code only creates a user object, the session will be established by
-    moin automatically.
+This code only creates a user object; the session will be established by
+Moin automatically.
 
-    python-ldap needs to be at least 2.0.0pre06 (available since mid 2002) for
-    ldaps support - some older debian installations (woody and older?) require
-    libldap2-tls and python2.x-ldap-tls, otherwise you get ldap.SERVER_DOWN:
-    "Can't contact LDAP server" - more recent debian installations have tls
-    support in libldap2 (see dependency on gnutls) and also in python-ldap.
+python-ldap needs to be at least 2.0.0pre06 (available since mid 2002) for
+LDAPS support — some older Debian installations (woody and older?) require
+libldap2-tls and python2.x-ldap-tls; otherwise you get ldap.SERVER_DOWN:
+"Can't contact LDAP server". More recent Debian installations have TLS
+support in libldap2 (see dependency on gnutls) and also in python-ldap.
 
-    TODO: allow more configuration (display name, ...) by using callables as parameters
+TODO: allow more configuration (display name, ...) by using callables as parameters
 """
 
 
@@ -35,9 +35,9 @@
 
 
 class LDAPAuth(BaseAuth):
-    """get authentication data from form, authenticate against LDAP (or Active
-    Directory), fetch some user infos from LDAP and create a user object
-    for that user. The session is kept by moin automatically.
+    """Get authentication data from the form, authenticate against LDAP (or Active
+    Directory), fetch some user info from LDAP, and create a user object
+    for that user. The session is kept by Moin automatically.
     """
 
     login_inputs = ["username", "password"]
diff --git a/src/moin/auth/log.py b/src/moin/auth/log.py
index 2cbca23b4..605b5b7aa 100644
--- a/src/moin/auth/log.py
+++ b/src/moin/auth/log.py
@@ -2,10 +2,10 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - logging auth plugin
+MoinMoin - logging auth plugin.
 
-    This does nothing except logging the auth parameters (the password is NOT
-    logged, of course).
+This does nothing except logging the auth parameters (the password is NOT
+logged, of course).
 """
 
 
@@ -17,7 +17,7 @@
 
 
 class AuthLog(BaseAuth):
-    """just log the call, do nothing else"""
+    """Just log the call; do nothing else."""
 
     name = "log"
 
diff --git a/src/moin/cli/__init__.py b/src/moin/cli/__init__.py
index 89eb33159..6217d4508 100644
--- a/src/moin/cli/__init__.py
+++ b/src/moin/cli/__init__.py
@@ -4,7 +4,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin CLI - Extension Script Package
+MoinMoin - CLI entry points and command registrations.
 """
 
 import click
@@ -23,18 +23,18 @@
 
 
 def Help():
-    """Moin initial help"""
+    """Moin quick help."""
     print(
         """\
 Quick help / most important commands overview:
 
-  moin create-instance  # Create wikiconfig and wiki instance directories
+  moin create-instance  # Create wikiconfig and instance directories
 
   moin index-create     # Create empty indexes and storage
 
-  moin run              # Run moin's builtin web server
+  moin run              # Run Moin's built-in web server
 
-  moin import19         # Import wiki data from moin 1.9
+  moin import19         # Import wiki data from Moin 1.9
 
 
 For more information please run:
@@ -43,7 +43,7 @@ def Help():
 
   moin <subcommand> --help
 
-or read the Docs at https://moin-20.readthedocs.io/
+or read the documentation at https://moin-20.readthedocs.io/
 """
     )
 
@@ -52,7 +52,7 @@ def Help():
 @click.group(cls=FlaskGroup, create_app=create_app, invoke_without_command=True)
 @click.pass_context
 def cli(ctx):
-    """Moin extensions to the Flask CLI"""
+    """Moin extensions to the Flask CLI."""
     logging.debug("invoked_subcommand: %s", ctx.invoked_subcommand)
     if ctx.invoked_subcommand is None:
         Help()
diff --git a/src/moin/cli/_tests/__init__.py b/src/moin/cli/_tests/__init__.py
index 3fb06913a..86ec9a7b1 100644
--- a/src/moin/cli/_tests/__init__.py
+++ b/src/moin/cli/_tests/__init__.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - moin.cli common functions for tests
+MoinMoin - common helper functions for moin.cli tests.
 """
 
 from __future__ import annotations
@@ -31,15 +31,16 @@ def run(
     timeout: int | None = None,
     env: dict[str, str] | None = None,
 ) -> subprocess.CompletedProcess | subprocess.Popen:
-    """run a shell command, redirecting output to log
-    :param cmd: list of strings containing command arguments
-    :param log: open file handle to log file (binary mode) or None in which case output will be captured
-    :param wait: if True return after process is complete, otherwise return immediately after start
-    :param timeout: timeout setting in seconds, can only be used when wait is True
-    :param env: dictionary of environment variables to add to current env for subprocess
-    :return: CompletedProcess object if wait else Popen object"""
+    """Run a shell command, redirecting output to a log.
+
+    :param cmd: List of strings containing command arguments.
+    :param log: Open file handle to a log file (binary mode) or None, in which case output will be captured.
+    :param wait: If True, return after the process completes; otherwise, return immediately after start.
+    :param timeout: Timeout in seconds; can only be used when wait is True.
+    :param env: Dictionary of environment variables to add to the current environment for the subprocess.
+    :return: CompletedProcess object if wait is True; otherwise, a Popen object."""
     subprocess_environ = copy(os.environ)
-    subprocess_environ["PYTHONIOENCODING"] = "cp1252"  # simulate windows terminal to ferret out encoding issues
+    subprocess_environ["PYTHONIOENCODING"] = "cp1252"  # Simulate Windows terminal to ferret out encoding issues
     if env:
         subprocess_environ.update(env)
     logging.info(f"running {cmd}")
@@ -61,7 +62,7 @@ def run(
 
 
 def assert_p_succcess(p: subprocess.CompletedProcess):
-    """assert returncode 0 and print logs on error"""
+    """Assert returncode 0 and print logs on error."""
     try:
         assert p.returncode == 0
     except AssertionError:
@@ -75,9 +76,9 @@ def assert_p_succcess(p: subprocess.CompletedProcess):
 
 
 def _is_eval_safe(s: str) -> bool:
-    """validate that s is one of the expected formats in output of moin index-dump
+    """Validate that s matches one of the expected formats in the output of 'moin index-dump'.
 
-    valid strings include
+    Valid strings include
     'a string'
     'a string doesn\'t have to be simple'
     ['one', 'two']
@@ -126,11 +127,11 @@ def _is_eval_safe(s: str) -> bool:
 
 
 def read_index_dump(out: str, latest=False):
-    """parse output of moin dump-index yielding the items
+    """Parse the output of 'moin index-dump', yielding the items.
 
-    :param out: stdout of `moin index-dump --no-truncate` command
-    :param latest: if True yield only the latest revs
-    :return: list of dicts with key value pairs from output"""
+    :param out: stdout of the `moin index-dump --no-truncate` command.
+    :param latest: If True, yield only the latest revisions.
+    :return: List of dicts with key/value pairs from the output."""
     if not isinstance(out, str):
         raise ValueError("read_index_dump_latest_revs expects str, did you forget to .decode()")
     item = {}
@@ -153,7 +154,7 @@ def read_index_dump(out: str, latest=False):
 
 
 def read_index_dump_latest_revs(out: str):
-    """parse output of moin dump-index yielding the items in latest revs see :py:func:`read_index_dump`"""
+    """Parse the output of 'moin index-dump' yielding only the latest revisions; see :py:func:`read_index_dump`."""
     yield from read_index_dump(out, True)
 
 
diff --git a/src/moin/cli/_tests/conftest.py b/src/moin/cli/_tests/conftest.py
index aa1043c40..610c439b6 100644
--- a/src/moin/cli/_tests/conftest.py
+++ b/src/moin/cli/_tests/conftest.py
@@ -2,20 +2,17 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - moin.cli pytest fixtures
+MoinMoin - pytest fixtures for moin.cli tests.
 
-Common fixtures for tests
+Common fixtures for the CLI test suite.
 
-fixtures are used for
+Fixtures are used for:
 
-* management of temporary directory under moin/_test_artifacts
-  which holds the test wiki instance
-* handling dependencies between cli commands
-  for example, index-create requires create-instance
+- Managing a temporary directory under moin/_test_artifacts that holds the test wiki instance.
+- Handling dependencies between CLI commands (for example, index-create requires create-instance).
 
-package scope fixtures used for efficiency in load-help and dump-help tests
-each cli command is executed only once
-while the tests are written one each per command
+Package-scoped fixtures are used for efficiency in load-help and dump-help tests:
+Each CLI command is executed only once, while the tests are written one per command.
 """
 
 import csv
@@ -42,9 +39,9 @@
 
 @pytest.fixture(scope="package")
 def artifact_dir():
-    """create and cd to and yield directory for wiki which persists thru all tests
+    """Create, chdir into, and yield the wiki directory that persists through all tests.
 
-    directory is deleted at end of all tests"""
+    The directory is deleted at the end of all tests."""
     _, artifact_dir = get_dirs("cli")
     cwd = os.getcwd()
     os.chdir(artifact_dir)
@@ -56,7 +53,7 @@ def artifact_dir():
 
 @pytest.fixture
 def artifact_dir2():
-    """create and cd to and yield directory for wiki which gets deleted at end of each test function"""
+    """Create, chdir into, and yield the wiki directory that is deleted at the end of each test function."""
     _, artifact_dir = get_dirs("cli2")
     cwd = os.getcwd()
     os.chdir(artifact_dir)
diff --git a/src/moin/cli/_tests/default_settings.py b/src/moin/cli/_tests/default_settings.py
index bd2493adf..a2fb08674 100644
--- a/src/moin/cli/_tests/default_settings.py
+++ b/src/moin/cli/_tests/default_settings.py
@@ -2,11 +2,12 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - moin.cli._tests.default_settings configurations for tests
+MoinMoin - default CLI test settings.
 
-these settings will run tests against the development server started via moin.cli._tests.conftest.server
-to run tests against another server, copy this file to settings.py
-if it exists, settings.py needs to contain all the entries as default_settings.py"""
+These settings run tests against the development server started via moin.cli._tests.conftest.server.
+To run tests against another server, copy this file to settings.py.
+If it exists, settings.py needs to contain all entries from default_settings.py.
+"""
 
 from moin.utils.iri import Iri
 
diff --git a/src/moin/cli/_tests/scrapy/moincrawler/items.py b/src/moin/cli/_tests/scrapy/moincrawler/items.py
index e5e4e84ce..877663804 100644
--- a/src/moin/cli/_tests/scrapy/moincrawler/items.py
+++ b/src/moin/cli/_tests/scrapy/moincrawler/items.py
@@ -2,9 +2,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - moin.cli._tests.scrapy.moincrawler.items classes for items gathered in the crawl test
+MoinMoin - dataclasses for items gathered during the crawl tests.
 
-scrapy item docs: https://docs.scrapy.org/en/latest/topics/items.html
+Scrapy item docs: https://docs.scrapy.org/en/latest/topics/items.html
 """
 from dataclasses import dataclass, fields, field
 
@@ -18,14 +18,14 @@
 
 @dataclass
 class CrawlResult:
-    """class representing result of a GET in the crawl, written to crawl.csv at spider close"""
+    """Represent the result of a GET in the crawl, written to crawl.csv when the spider closes."""
 
     url: Iri = ""
     from_url: Iri = ""
-    from_text: str = ""  # link text if any
-    from_type: str = ""  # attribute name where this href was found
+    from_text: str = ""  # link text, if any
+    from_type: str = ""  # attribute name where this link was found
     response_code: int = ""
-    response_exc: str = ""  # exeption if any
+    response_exc: str = ""  # exception, if any
 
     def __post_init__(self):
         if self.url:
@@ -49,18 +49,19 @@ def __repr__(self):
 
 @dataclass
 class CrawlResultMatch(CrawlResult):
-    """class for matching to CrawlResult
+    """Class for matching against CrawlResult.
 
-    if initialiized with relative url, prepend CRAWL_START for matching
-        e.g. '/html' -> 'http:127.0.0.1:9080/help-en/html"""
+    If initialized with a relative URL, prepend CRAWL_START for matching,
+    e.g., '/html' -> 'http://127.0.0.1:9080/help-en/html'.
+    """
 
-    url_path_components: list[str] = field(default_factory=list)  # list of path components to match on
+    url_path_components: list[str] = field(default_factory=list)  # list of path components to match against
 
     def match(self, other: CrawlResult) -> bool:
-        """return True if
+        """Return True if:
 
-        for each of my not None fields, other is an exact match
-        if my url_path_components is set, require at least one of self.url_path_components in other.url.path
+        - For each of my non-None fields, the other object has the exact same value.
+        - If url_path_components is set, require at least one of them to appear in other.url.path.
         """
         for f in fields(CrawlResult):
             if (my_value := getattr(self, f.name)) and my_value != getattr(other, f.name):
@@ -75,7 +76,7 @@ def match(self, other: CrawlResult) -> bool:
 
     @staticmethod
     def _relative_to_absolute(url: Iri):
-        """prepend CRAWL_START to relative url"""
+        """Prepend CRAWL_START to a relative URL."""
         if url and not url.scheme:
             url_path = url.path.fullquoted if url.path else ""
             return Iri(
diff --git a/src/moin/cli/_tests/scrapy/moincrawler/settings.py b/src/moin/cli/_tests/scrapy/moincrawler/settings.py
index 93442f8dc..bd6285121 100644
--- a/src/moin/cli/_tests/scrapy/moincrawler/settings.py
+++ b/src/moin/cli/_tests/scrapy/moincrawler/settings.py
@@ -2,21 +2,20 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - moin.cli._tests.scrapy.moincrawler.settings
+MoinMoin - Scrapy project settings for moincrawler.
 
-Scrapy settings for moincrawler project, generated by ``scrapy startproject``
+Scrapy settings for the moincrawler project, generated by ``scrapy startproject``.
 
-# For simplicity, this file contains only settings considered important or
-# commonly used. You can find more settings consulting the documentation:
-#
-#     https://docs.scrapy.org/en/latest/topics/settings.html
-#     https://docs.scrapy.org/en/latest/topics/downloader-middleware.html
-#     https://docs.scrapy.org/en/latest/topics/spider-middleware.html
+For simplicity, this file contains only settings considered important or commonly used.
+For more settings, consult the documentation:
+    https://docs.scrapy.org/en/latest/topics/settings.html
+    https://docs.scrapy.org/en/latest/topics/downloader-middleware.html
+    https://docs.scrapy.org/en/latest/topics/spider-middleware.html
 """
 
-BOT_NAME = 'moincrawler'
+BOT_NAME = "moincrawler"
 
-SPIDER_MODULES = ['moin.cli._tests.scrapy.moincrawler.spiders']
-NEWSPIDER_MODULE = 'moin.cli._tests.scrapy.moincrawler.spiders'
+SPIDER_MODULES = ["moin.cli._tests.scrapy.moincrawler.spiders"]
+NEWSPIDER_MODULE = "moin.cli._tests.scrapy.moincrawler.spiders"
 # Obey robots.txt rules
 ROBOTSTXT_OBEY = True
diff --git a/src/moin/cli/_tests/scrapy/moincrawler/spiders/__init__.py b/src/moin/cli/_tests/scrapy/moincrawler/spiders/__init__.py
index e72cae1a7..039d9852c 100644
--- a/src/moin/cli/_tests/scrapy/moincrawler/spiders/__init__.py
+++ b/src/moin/cli/_tests/scrapy/moincrawler/spiders/__init__.py
@@ -2,5 +2,5 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - moin.cli._tests.moincrawler.spiders
+MoinMoin - scrapy spiders used by CLI crawl tests.
 """
diff --git a/src/moin/cli/_tests/scrapy/moincrawler/spiders/ref_checker.py b/src/moin/cli/_tests/scrapy/moincrawler/spiders/ref_checker.py
index b94dbe933..15a768ab8 100644
--- a/src/moin/cli/_tests/scrapy/moincrawler/spiders/ref_checker.py
+++ b/src/moin/cli/_tests/scrapy/moincrawler/spiders/ref_checker.py
@@ -2,10 +2,10 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - moin.cli._tests.scrapy.moincrawler.ref_checker
+MoinMoin - Scrapy spider to check references.
 
-spider a moin site and report on 404 and other errors for href, src, data, and data-href attribs
-this spider is run via moin.cli._tests.conftest.do_crawl via moin.cli._tests.test_scrapy_crawl
+Spider a Moin site and report 404 and other errors for href, src, data, and data-href attributes.
+This spider is run via moin.cli._tests.conftest.do_crawl from moin.cli._tests.test_scrapy_crawl.
 """
 
 import csv
@@ -33,18 +33,19 @@
 
 
 class RefCheckerSpider(scrapy.Spider):
-    """crawl moin pages following href, src, data, and data-href attributes
+    """Crawl Moin pages following href, src, data, and data-href attributes.
 
-    this spider is run via moin.cli._tests.conftest.do_crawl via moin.cli._tests.test_scrapy_crawl
-    on close the spider writes results to _test_artifacts/crawl.csv
-    crawl.csv will be read by test_scrapy_crawl
-    original design shamelessly stolen (with permission) from
-        https://www.linode.com/docs/guides/use-scrapy-to-extract-data-from-html-tags/"""
+    This spider is run via moin.cli._tests.conftest.do_crawl from moin.cli._tests.test_scrapy_crawl.
+    On close, the spider writes results to _test_artifacts/crawl.csv.
+    The file crawl.csv is then read by test_scrapy_crawl.
+    Original design adapted (with permission) from:
+        https://www.linode.com/docs/guides/use-scrapy-to-extract-data-from-html-tags/
+    """
 
     name = "ref_checker"
 
     def __init__(self, url="http://127.0.0.1:8080/", *args, **kwargs):
-        """:param url: start url for crawl, overridden by settings.CRAWL_START in moin.cli.conftest.do_crawl"""
+        """:param url: Start URL for the crawl; overridden by settings.CRAWL_START in moin.cli.conftest.do_crawl."""
         super().__init__(*args, **kwargs)
         self.start_urls = [url]
         self.no_crawl_paths = ["/MoinWikiMacros/MonthCalendar"]  # lots of 404s for the dates
@@ -81,7 +82,8 @@ def spider_closed(self):
     def _parse(self, response, **kwargs):
         """Main method that parses downloaded pages.
 
-        requests yielded from this method are added to the crawl queue"""
+        Requests yielded from this method are added to the crawl queue.
+        """
         try:
             result = response.meta["my_data"]
         except KeyError:
@@ -151,7 +153,7 @@ def _parse(self, response, **kwargs):
                     yield request
 
     def parse(self, response, **kwargs):
-        """called by scrapy framework"""
+        """Called by the Scrapy framework."""
         try:
             yield from self._parse(response, **kwargs)
         except Exception as e:  # noqa
diff --git a/src/moin/cli/_tests/test_cli.py b/src/moin/cli/_tests/test_cli.py
index 0c1ec0d56..516338980 100644
--- a/src/moin/cli/_tests/test_cli.py
+++ b/src/moin/cli/_tests/test_cli.py
@@ -2,9 +2,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - moin.cli base tests
+MoinMoin - tests for moin.cli base.
 
-tests for cli defined in moin/cli/__init__.py
+Tests for the CLI defined in moin/cli/__init__.py.
 """
 
 from moin.cli._tests import run, assert_p_succcess
diff --git a/src/moin/cli/_tests/test_create_instance.py b/src/moin/cli/_tests/test_create_instance.py
index 293335253..d4da0579f 100644
--- a/src/moin/cli/_tests/test_create_instance.py
+++ b/src/moin/cli/_tests/test_create_instance.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - moin.cli.maint.create_instance tests
+MoinMoin - tests for moin.cli.maint.create_instance.
 """
 
 from moin.cli._tests import assert_p_succcess
diff --git a/src/moin/cli/_tests/test_index.py b/src/moin/cli/_tests/test_index.py
index 1491f87a3..afb7e76d4 100644
--- a/src/moin/cli/_tests/test_index.py
+++ b/src/moin/cli/_tests/test_index.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - moin.cli.maint.index tests
+MoinMoin - tests for moin.cli.maint.index.
 """
 
 from pathlib import Path
diff --git a/src/moin/cli/_tests/test_modify_item.py b/src/moin/cli/_tests/test_modify_item.py
index 37bcb3647..37b514972 100644
--- a/src/moin/cli/_tests/test_modify_item.py
+++ b/src/moin/cli/_tests/test_modify_item.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - moin.cli.maint.modify_item tests
+MoinMoin - tests for moin.cli.maint.modify_item.
 """
 
 import json
@@ -69,7 +69,7 @@ def test_dump_help(load_help):
 
 
 def test_item_get(load_help):
-    """extract an item from help and validate data and meta match original files in moin/help"""
+    """Extract an item from help and validate that data and metadata match the original files in moin/help."""
     item_get = run(["moin", "item-get", "-n", "help-common/cat.jpg", "-m", "cat.meta", "-d", "cat.data"])
     assert_p_succcess(item_get)
     assert Path("cat.data").exists()
@@ -92,11 +92,11 @@ def test_item_get(load_help):
 
 
 def test_item_put(index_create2):
-    """validate ability to add a new item to the wiki via item-put and extract using item-get
+    """Validate the ability to add a new item to the wiki via item-put and extract it using item-get.
 
-    include an item with non-ascii characters in name, tags and summary
+    Include an item with non-ASCII characters in the name, tags, and summary.
 
-    check for ability to handle non-ascii characters in index-dump"""
+    Check the ability to handle non-ASCII characters in index-dump."""
     for page in ["Home", "help-common/Home", "MyRussianPage"]:
         page_filename = page.replace("/", "-")
         item_get_fail = run(
diff --git a/src/moin/cli/_tests/test_scrapy_crawl.py b/src/moin/cli/_tests/test_scrapy_crawl.py
index a5e99382a..dd7737f52 100644
--- a/src/moin/cli/_tests/test_scrapy_crawl.py
+++ b/src/moin/cli/_tests/test_scrapy_crawl.py
@@ -2,9 +2,10 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - moin.cli._tests.test_scrapy_crawl
+MoinMoin - tests for moin.cli scrapy crawl.
 
-crawl moin site and report on errors"""
+Crawl a Moin site and report errors.
+"""
 
 import pytest
 
@@ -96,9 +97,10 @@ def test_expected_failures(self, crawl_results):
 
     @pytest.mark.skip
     def test_known_issues_exist(self, crawl_results):
-        """enable this test to check for KNOWN_ISSUES which can be removed
-        after removing, be sure to confirm by crawling a host with non-blank SITE_WIKI_ROOT
-        as some issues only exist when moin is running behind apache"""
+        """Enable this test to check for KNOWN_ISSUES which can be removed.
+        After removing, be sure to confirm by crawling a host with a non-blank SITE_WIKI_ROOT,
+        as some issues exist only when Moin is running behind Apache.
+        """
         assert crawl_results[1], f"crawl failed, check {get_crawl_log_path()}"
         fixed = []
         for m in self.KNOWN_ISSUES:
@@ -146,9 +148,10 @@ def _next_server_log_line(self):
         return True
 
     def test_server_log(self, server_crawl_log):
-        """validate no ERROR nor Traceback in log
+        """Validate that there is no ERROR or Traceback in the log.
 
-        see https://github.com/moinwiki/moin/pull/1399"""
+        See https://github.com/moinwiki/moin/pull/1399
+        """
         with open(server_crawl_log) as self.server_log:
             trailing_line_count = 0
             is_traceback = False
diff --git a/src/moin/cli/_tests/test_serialization.py b/src/moin/cli/_tests/test_serialization.py
index 41354d623..2d3635f77 100644
--- a/src/moin/cli/_tests/test_serialization.py
+++ b/src/moin/cli/_tests/test_serialization.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - moin.cli.maint.serialization tests
+MoinMoin - tests for moin.cli.maint.serialization.
 """
 
 import json
@@ -35,7 +35,7 @@ def load(restore_dir, backup_name, artifact_dir, args=None):
             p = run(command)
             assert_p_succcess(p)
     finally:
-        os.chdir(artifact_dir)  # insure we return to archive_dir for other tests
+        os.chdir(artifact_dir)  # ensure we return to archive_dir for other tests
 
 
 def test_load_all(artifact_dir, save_all):
@@ -85,7 +85,7 @@ def test_load_default_ns(artifact_dir, save_default):
                 expected_content = f.read()
                 assert expected_content, content
     finally:
-        os.chdir(artifact_dir)  # insure we return to archive_dir for other tests
+        os.chdir(artifact_dir)  # ensure we return to archive_dir for other tests
 
 
 def test_load_new_ns(artifact_dir, save_default):
@@ -100,7 +100,7 @@ def test_load_new_ns(artifact_dir, save_default):
         assert ["Home"] == item[NAME]
         assert "help-en" == item[BACKENDNAME]
     finally:
-        os.chdir(artifact_dir)  # insure we return to archive_dir for other tests
+        os.chdir(artifact_dir)  # ensure we return to archive_dir for other tests
 
 
 def test_load_corrupt(artifact_dir2, index_create2):
diff --git a/src/moin/cli/_tests/test_set_meta.py b/src/moin/cli/_tests/test_set_meta.py
index dc05de24d..609e60ed5 100644
--- a/src/moin/cli/_tests/test_set_meta.py
+++ b/src/moin/cli/_tests/test_set_meta.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - moin.cli.maint.set_meta tests
+MoinMoin - tests for moin.cli.maint.set_meta.
 """
 
 from moin._tests import get_dirs
diff --git a/src/moin/cli/_util.py b/src/moin/cli/_util.py
index f1fd15480..b7ed3e731 100644
--- a/src/moin/cli/_util.py
+++ b/src/moin/cli/_util.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin cli._util common functions used in cli
+MoinMoin - common utilities for CLI commands.
 """
 
 from typing import Optional
@@ -16,9 +16,11 @@
 
 
 def get_backends(backends: Optional[str], all_backends: bool) -> set[Backend]:
-    """return set of Backends for cli parameters
-    :param backends: comma separated list of backends
-    :param all_backends: True to include all backends, overrides backends parameter if True"""
+    """Return a set of Backends for CLI parameters.
+
+    :param backends: Comma-separated list of backend names.
+    :param all_backends: If True, include all backends (overrides 'backends').
+    """
     if all_backends:
         return set(app.cfg.backend_mapping.values())
     if backends:
@@ -36,10 +38,11 @@ def get_backends(backends: Optional[str], all_backends: bool) -> set[Backend]:
 
 
 def drop_and_recreate_index(indexer, procs=None, limitmb=None, multisegment=False):
-    """Drop index and recreate, rebuild and optimize
-    :param indexer: IndexingMiddleware object
+    """Drop the index and recreate, rebuild, and optimize it.
+
+    :param indexer: IndexingMiddleware object.
     :param procs: Number of processors the writer will use.
-    :param limitmb: Maximum memory (in megabytes) each index-writer will use for the indexing pool
+    :param limitmb: Maximum memory (in megabytes) each index writer will use for the indexing pool.
     """
     indexer.close()
     indexer.destroy()
diff --git a/src/moin/cli/account/__init__.py b/src/moin/cli/account/__init__.py
index 639a1853b..368bc38eb 100644
--- a/src/moin/cli/account/__init__.py
+++ b/src/moin/cli/account/__init__.py
@@ -3,5 +3,5 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin CLI - User Accounts Management Scripts
+MoinMoin - CLI commands for user account management.
 """
diff --git a/src/moin/cli/account/create.py b/src/moin/cli/account/create.py
index b163141e2..99e26298c 100644
--- a/src/moin/cli/account/create.py
+++ b/src/moin/cli/account/create.py
@@ -4,7 +4,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin CLI - create a user account
+MoinMoin - CLI command to create a user account.
 """
 
 
@@ -32,10 +32,10 @@ def cli():
     "--display-name",
     required=False,
     type=str,
-    help="Set the wiki user's display name to DISPLAY_NAME (e.g. in case the NAME is cryptic).",
+    help="Set the wiki user's display name to DISPLAY_NAME (e.g., when NAME is cryptic).",
 )
 def CreateUser(name, display_name, email, password):
-    """Create a new user account"""
+    """Create a new user account."""
     logging.debug("display_name: %s", str(display_name))
     before_wiki()
 
diff --git a/src/moin/cli/account/disable.py b/src/moin/cli/account/disable.py
index 4c8c046b7..7c56840fd 100644
--- a/src/moin/cli/account/disable.py
+++ b/src/moin/cli/account/disable.py
@@ -4,7 +4,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin CLI - disable a user account
+MoinMoin - CLI command to disable a user account.
 """
 
 
@@ -24,11 +24,11 @@ def cli():
 
 @cli.command("account-disable", help="Disable user accounts")
 @click.option("--name", "-n", required=False, type=str, help="Disable the user with user name NAME.")
-@click.option("--uid", "-u", required=False, type=str, help="Disable the user with user id UID.")
+@click.option("--uid", "-u", required=False, type=str, help="Disable the user with user ID UID.")
 def DisableUser(name, uid):
     flags_given = name or uid
     if not flags_given:
-        print("incorrect number of arguments")
+        print("Incorrect number of arguments.")
         import sys
 
         sys.exit()
@@ -40,7 +40,7 @@ def DisableUser(name, uid):
         u = user.User(auth_username=name)
 
     if not u.exists():
-        print(f'This user "{u.name!r}" does not exists!')
+        print(f'This user "{u.name!r}" does not exist!')
         return
 
     print(f" {u.itemid:<20} {u.name!r:<25} {u.email:<35}", end=" ")
diff --git a/src/moin/cli/account/resetpw.py b/src/moin/cli/account/resetpw.py
index a2b4ce486..539acee75 100644
--- a/src/moin/cli/account/resetpw.py
+++ b/src/moin/cli/account/resetpw.py
@@ -5,7 +5,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin CLI - set a user password
+MoinMoin - CLI command to set a user password.
 """
 
 import sys
@@ -27,19 +27,19 @@ def cli():
 
 
 class Fault(Exception):
-    """something went wrong"""
+    """Something went wrong."""
 
 
 class NoSuchUser(Fault):
-    """raised if no such user exists"""
+    """Raised if no such user exists."""
 
 
 class UserHasNoEMail(Fault):
-    """raised if user has no e-mail address in his profile"""
+    """Raised if the user has no email address in their profile."""
 
 
 class MailFailed(Fault):
-    """raised if e-mail sending failed"""
+    """Raised if email sending failed."""
 
 
 def set_password(uid, password, notify=False, skip_invalid=False, subject=None, text=None):
@@ -52,19 +52,19 @@ def set_password(uid, password, notify=False, skip_invalid=False, subject=None,
         if notify and not u.disabled:
             if not u.email:
                 raise UserHasNoEMail(
-                    "Notification was requested, but User profile does not have "
-                    "a validated E-Mail address (name: %r id: %r)!" % (u.name, u.itemid)
+                    "Notification was requested, but the user profile does not have "
+                    "a validated email address (name: %r, id: %r)!" % (u.name, u.itemid)
                 )
             mailok, msg = u.mail_password_recovery(subject=subject, text=text)
             if not mailok:
                 raise MailFailed(msg)
     else:
-        raise NoSuchUser("User does not exist (name: %r id: %r)!" % (u.name, u.id))
+        raise NoSuchUser("User does not exist (name: %r, id: %r)!" % (u.name, u.id))
 
 
 @cli.command("account-password", help="Set user passwords")
 @click.option("--name", "-n", required=False, type=str, help="Set password for the user with user name NAME.")
-@click.option("--uid", "-u", required=False, type=str, help="Set password for the user with user id UID.")
+@click.option("--uid", "-u", required=False, type=str, help="Set password for the user with user ID UID.")
 @click.option("--password", "-p", required=False, type=str, help="New password for this account.")
 @click.option("--all-users", "-a", is_flag=True, required=False, default=False, help="Reset password for ALL users.")
 @click.option(
@@ -73,22 +73,22 @@ def set_password(uid, password, notify=False, skip_invalid=False, subject=None,
     is_flag=True,
     required=False,
     default=False,
-    help="Notify user(s), send them an E-Mail with a password reset link.",
+    help="Notify user(s); send them an email with a password reset link.",
 )
 @click.option("--verbose", "-v", is_flag=True, required=False, default=False, help="Verbose operation")
-@click.option("--subject", required=False, type=str, help="Subject text for the password reset notification E-Mail.")
+@click.option("--subject", required=False, type=str, help="Subject text for the password reset notification email.")
 @click.option(
     "--text",
     required=False,
     type=str,
-    help="Template text for the password reset notification E-Mail. " "Default: use the builtin standard template",
+    help="Template text for the password reset notification email. Default: use the built-in standard template",
 )
 @click.option(
     "--text-from-file",
     required=False,
     type=str,
-    help="Read full template for the password reset notification E-Mail from the given file, "
-    "overrides --text. Default: None",
+    help="Read the full template for the password reset notification email from the given file, "
+    "which overrides --text. Default: None",
 )
 @click.option(
     "--skip-invalid",
@@ -100,7 +100,7 @@ def set_password(uid, password, notify=False, skip_invalid=False, subject=None,
 def SetPassword(name, uid, password, all_users, notify, verbose, subject, text, text_from_file, skip_invalid):
     flags_given = name or uid or all_users
     if not flags_given:
-        print("incorrect number of arguments")
+        print("Incorrect number of arguments.")
         sys.exit(1)
 
     if notify and not app.cfg.mail_enabled:
@@ -119,7 +119,7 @@ def SetPassword(name, uid, password, all_users, notify, verbose, subject, text,
     elif all_users:
         query = {}
 
-    # sorting the list so we have some specific, reproducable order
+    # Sorting the list so we have a specific, reproducible order
     uids_metas = sorted([(rev.meta[ITEMID], rev.meta) for rev in user.search_users(**query)])
     total = len(uids_metas)
     if not total:
@@ -133,8 +133,8 @@ def SetPassword(name, uid, password, all_users, notify, verbose, subject, text,
             email = meta.get(EMAIL_UNVALIDATED)
             if email is None:
                 raise ValueError(
-                    "neither EMAIL nor EMAIL_UNVALIDATED key is present in "
-                    "user profile metadata of uid %r name %r" % (uid, name)
+                    "Neither EMAIL nor EMAIL_UNVALIDATED keys are present in "
+                    "the user profile metadata of uid %r, name %r" % (uid, name)
                 )
             email += "[email_unvalidated]"
         try:
diff --git a/src/moin/cli/maint/__init__.py b/src/moin/cli/maint/__init__.py
index 8b0ceb4f1..210495a4d 100644
--- a/src/moin/cli/maint/__init__.py
+++ b/src/moin/cli/maint/__init__.py
@@ -3,5 +3,5 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin CLI - Maintenance Script Package
+MoinMoin - CLI maintenance commands.
 """
diff --git a/src/moin/cli/maint/create_instance.py b/src/moin/cli/maint/create_instance.py
index 753618643..256897f53 100644
--- a/src/moin/cli/maint/create_instance.py
+++ b/src/moin/cli/maint/create_instance.py
@@ -3,24 +3,24 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin CLI - Create a MoinMoin wiki instance.
+MoinMoin - CLI command to create a wiki instance.
 
-Activate a moin virtual env, then run this command:
+Activate a Moin virtual environment, then run this command:
 
     moin create-instance --path /path/to/new/instance
 
-If path is not specified, the CWD is used as a default.
+If --path is not specified, the current working directory (CWD) is used.
 
 If the path does not exist, directories are created.
 If wikiconfig.py does not exist, it is copied from the venv config directory.
 If intermap.txt does not exist, it is copied from the venv contrib directory.
 If a wiki_local directory does not exist, it is created.
 
-Next: CD to new instance directory, run this command to initialize storage and index
+Next: change to the new instance directory and run this command to initialize storage and the index:
 
     moin index-create
 
-Optionally, populate the empty wiki with additional commands
+Optionally, populate the empty wiki with additional commands:
 
     moin load <options>
     moin import19 <options>
@@ -46,17 +46,21 @@ def cli():
     pass
 
 
-@cli.command("create-instance", help="Create wikiconfig and wiki instance directories and copy required files")
+@cli.command("create-instance", help="Create wikiconfig and wiki instance directories and copy required files.")
 @click.option(
     "--full",
     "-f",
     required=False,
     is_flag=True,
     default=False,
-    help="full setup including index creation and load of help data and welcome page",
+    help="Full setup, including index creation and loading help data and the welcome page.",
 )
 @click.option(
-    "--path", "-p", required=False, type=str, help="Path to new wikiconfig dir, defaults to CWD if not specified."
+    "--path",
+    "-p",
+    required=False,
+    type=str,
+    help="Path to the new wikiconfig directory; defaults to CWD if not specified.",
 )
 def cli_CreateInstance(full, path):
     return CreateInstance(full, path=path)
@@ -103,15 +107,15 @@ def CreateInstance(full, **kwargs):
 
 def build_instance():
     """
-    Create and build index, load help data and welcome page.
+    Create and build the index; load help data and the welcome page.
     """
-    logging.info("Build Instance started.")
+    logging.info("Build instance started.")
     if index.IndexCreate():
         modify_item.LoadHelp(namespace="help-en", path_to_help=None)
         modify_item.LoadHelp(namespace="help-common", path_to_help=None)
         modify_item.LoadWelcome()
         index.IndexOptimize(tmp=False)
         logging.info("Full instance setup finished.")
-        logging.info('You can now use "moin run" to start the builtin server.')
+        logging.info('You can now use "moin run" to start the built-in server.')
     else:
         logging.error("Build Instance failed.")
diff --git a/src/moin/cli/maint/dump_html.py b/src/moin/cli/maint/dump_html.py
index 6f19872c0..23f31f1e7 100644
--- a/src/moin/cli/maint/dump_html.py
+++ b/src/moin/cli/maint/dump_html.py
@@ -3,37 +3,31 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin CLI - Creates a static dump of HTML files for each current item in this wiki.
+MoinMoin - CLI command to create a static HTML dump for each current item in this wiki.
 
 Usage:
     moin dump-html <options>
 
 Options:
     --theme=<theme name>
-    --directory=<output directory name>  # name with / means full path, else under moin root directory
-    --exclude-ns=<comma separated list of namespaces to exclude>
+    --directory=<output directory name>  # If the name contains a '/', it is treated as a full path; otherwise it is created under the Moin root directory.
+    --exclude-ns=<comma-separated list of namespaces to exclude>
     --query=<item name or regex to select items>
 
 Defaults:
     --theme=topside_cms
-    --directory=<install root dir>HTML
+    --directory=<install root dir>/HTML
     --exclude-ns=userprofiles
 
-Works best with a CMS-like theme that excludes the wiki navigation links for login, edit,
-etc. that are not useful within a static HTML dump.
+Works best with a CMS-like theme that excludes wiki navigation links for login, edit, etc., which are not useful in a static HTML dump.
 
-Most html-formatted files created in the root (HTML) directory will not have names
-ending with .html, just as the paths used by the wiki server do not end with .html
-(e.g. http://127.0.0.1/Home). All browsers tested follow links to pages not
-having .html suffixes without complaint.
+Most HTML-formatted files created in the root (HTML) directory will not have names ending with .html, just as the paths used by the wiki server do not end with .html (e.g., http://127.0.0.1/Home). All tested browsers follow links to pages without .html suffixes without complaint.
 
 Duplicate copies of the home page and index page are created with names ending with .html.
 
-Items with media content types and names ending in common media suffixes (.png, .svg, .mp4...)
-will have their raw data, not HTML formatted pages, stored in the root HTML directory. All browsers
-tested view HTML formatted pages with names ending in common media suffixes as corrupt files.
+Items with media content types and names ending in common media suffixes (.png, .svg, .mp4, …) will have their raw data (not HTML-formatted pages) stored in the root HTML directory. All tested browsers treat HTML-formatted pages with names ending in common media suffixes as corrupt files.
 
-The raw data of all items are stored in the +get subdirectory.
+The raw data for all items is stored in the +get subdirectory.
 """
 
 import os
@@ -74,33 +68,33 @@ def cli():
     pass
 
 
-@cli.command("dump-html", help="Create a static HTML image of this wiki")
+@cli.command("dump-html", help="Create a static HTML snapshot of this wiki")
 @click.option(
     "--directory",
     "-d",
     type=str,
     required=False,
     default="HTML",
-    help="Directory name containing the output files, default HTML",
+    help="Directory name for the output files; default: HTML",
 )
 @click.option(
     "--theme",
     "-t",
     required=False,
     default="topside_cms",
-    help="Name of theme used in creating output pages, default topside_cms",
+    help="Name of the theme used to create output pages; default: topside_cms",
 )
 @click.option(
     "--exclude-ns",
     "-e",
     required=False,
     default="userprofiles",
-    help="Comma separated list of excluded namespaces, default userprofiles",
+    help="Comma-separated list of excluded namespaces; default: userprofiles",
 )
-@click.option("--query", "-q", required=False, default=None, help="name or regex of items to be included")
+@click.option("--query", "-q", required=False, default=None, help="Name or regex of items to include")
 def Dump(directory="HTML", theme="topside_cms", exclude_ns="userprofiles", user=None, query=None):
     with app.test_request_context():
-        logging.info("Dump html started")
+        logging.info("Dump HTML started")
         if theme:
             app.cfg.user_defaults[THEME_NAME] = theme
         exclude_ns = exclude_ns.split(",") if exclude_ns else []
diff --git a/src/moin/cli/maint/index.py b/src/moin/cli/maint/index.py
index 0ce8cabf5..3d6a5bb09 100644
--- a/src/moin/cli/maint/index.py
+++ b/src/moin/cli/maint/index.py
@@ -3,7 +3,8 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin CLI - manage whoosh indexes (building, updating, (re)moving and displaying)
+MoinMoin - CLI commands to manage Whoosh indexes (creating, destroying, building,
+updating, moving, optimizing, and displaying).
 """
 
 
@@ -30,7 +31,7 @@ def cli():
 
 
 @cli.command("index-create", help="Create empty indexes")
-@click.option("--tmp", is_flag=True, required=False, default=False, help="use the temporary location.")
+@click.option("--tmp", is_flag=True, required=False, default=False, help="Use the temporary location.")
 @click.option("-i", "--index-create", is_flag=True, required=False, default=False, help="(deprecated)")
 @click.option("-s", "--storage-create", is_flag=True, required=False, default=False, help="(deprecated)")
 def cli_IndexCreate(tmp, index_create, storage_create):
@@ -43,7 +44,7 @@ def cli_IndexCreate(tmp, index_create, storage_create):
 
 def IndexCreate(**kwargs):
     """
-    Create empty indexes
+    Create empty indexes.
     """
     if wiki_index_exists():
         logging.error("Error: wiki index exists. Please check and destroy index before running index-create")
@@ -57,7 +58,7 @@ def IndexCreate(**kwargs):
 
 
 @cli.command("index-destroy", help="Destroy the indexes")
-@click.option("--tmp", is_flag=True, required=False, default=False, help="use the temporary location.")
+@click.option("--tmp", is_flag=True, required=False, default=False, help="Use the temporary location.")
 def IndexDestroy(tmp):
     if not wiki_index_exists():
         logging.error(ERR_NO_INDEX)
@@ -75,9 +76,9 @@ def IndexDestroy(tmp):
     required=False,
     type=int,
     default=None,
-    help="Maximum memory (in megabytes) each index-writer will use for the indexing pool.",
+    help="Maximum memory (in megabytes) each index writer will use for the indexing pool.",
 )
-@click.option("--tmp", is_flag=True, required=False, default=False, help="use the temporary location.")
+@click.option("--tmp", is_flag=True, required=False, default=False, help="Use the temporary location.")
 @click.option("--index-create", "-i", is_flag=True, required=False, default=False)
 @click.option("--storage-create", "-s", is_flag=True, required=False, default=False)
 def IndexBuild(tmp, procs, limitmb, **kwargs):
@@ -91,14 +92,14 @@ def IndexBuild(tmp, procs, limitmb, **kwargs):
 
 
 @cli.command("index-update", help="Update the indexes")
-@click.option("--tmp", is_flag=True, required=False, default=False, help="use the temporary location.")
+@click.option("--tmp", is_flag=True, required=False, default=False, help="Use the temporary location.")
 def IndexUpdate(tmp):
     if not wiki_index_exists():
         logging.error(ERR_NO_INDEX)
         raise SystemExit(1)
     logging.info("Index update started")
     app.storage.update(tmp=tmp)
-    logging.info("Index update started")
+    logging.info("Index update finished")
 
 
 @cli.command("index-move", help="Move the indexes from the temporary to the normal location")
@@ -109,14 +110,14 @@ def IndexMove():
 
 
 @cli.command("index-optimize", help="Optimize the indexes")
-@click.option("--tmp", is_flag=True, required=False, default=False, help="use the temporary location.")
+@click.option("--tmp", is_flag=True, required=False, default=False, help="Use the temporary location.")
 def cli_IndexOptimize(tmp):
     return IndexOptimize(tmp)
 
 
 def IndexOptimize(tmp):
     """
-    Optimize the indexes
+    Optimize the indexes.
     """
     if not wiki_index_exists():
         logging.error(ERR_NO_INDEX)
@@ -127,8 +128,8 @@ def IndexOptimize(tmp):
 
 
 @cli.command("index-dump", help="Dump the indexes in readable form to stdout")
-@click.option("--tmp", is_flag=True, required=False, default=False, help="use the temporary location.")
-@click.option("--truncate/--no-truncate", default=True, help="truncate long entries")
+@click.option("--tmp", is_flag=True, required=False, default=False, help="Use the temporary location.")
+@click.option("--truncate/--no-truncate", default=True, help="Truncate long entries.")
 def IndexDump(tmp, truncate):
     if not wiki_index_exists():
         logging.error(ERR_NO_INDEX)
diff --git a/src/moin/cli/maint/modify_item.py b/src/moin/cli/maint/modify_item.py
index c0c5f85e4..901785c4b 100644
--- a/src/moin/cli/maint/modify_item.py
+++ b/src/moin/cli/maint/modify_item.py
@@ -4,7 +4,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin CLI - get an item revision from the wiki, put it back into the wiki.
+MoinMoin - CLI commands to get an item revision from the wiki and put it back.
 """
 
 from collections import defaultdict
@@ -56,9 +56,11 @@ def cli():
 @cli.command("item-get", help="Get an item revision from the wiki")
 @click.option("--name", "-n", type=str, required=True, help="Name of the item to get.")
 @click.option(
-    "--meta", "-m", "--meta_file", type=str, required=True, help="Filename of file to create for the metadata."
+    "--meta", "-m", "--meta_file", type=str, required=True, help="Filename of the file to create for the metadata."
+)
+@click.option(
+    "--data", "-d", "--data_file", type=str, required=True, help="Filename of the file to create for the data."
 )
-@click.option("--data", "-d", "--data_file", type=str, required=True, help="Filename of file to create for the data.")
 @click.option(
     "--revid",
     "-r",
@@ -67,7 +69,7 @@ def cli():
     default=CURRENT,
     help="Revision ID of the revision to get (default: current rev).",
 )
-@click.option("--crlf/--no-crlf", help="use windows line endings in output files")
+@click.option("--crlf/--no-crlf", help="Use Windows line endings in output files")
 def cli_GetItem(name, meta, data, revid, crlf):
     logging.info("Get item started")
     GetItem(name, meta, data, revid, "\r\n" if crlf else "\n")
@@ -87,9 +89,9 @@ def GetItem(name, meta_file, data_file, revid, newline="\n"):
     with open(meta_file, "w", encoding="utf-8", newline=newline) as mf:
         mf.write(meta + "\n")
     if "charset" in rev.meta[CONTENTTYPE]:
-        # input data will have \r\n line endings, output will have specified endings
-        # those running on windows with git autocrlf=true will want --crlf
-        # those running on linux or with autocrlf=input will want --no-crlf
+        # Input data will have \r\n line endings; output will use the specified endings.
+        # Those running on Windows with git autocrlf=true will want --crlf.
+        # Those running on Linux or with autocrlf=input will want --no-crlf.
         charset = rev.meta[CONTENTTYPE].split("charset=")[1]
         data = rev.data.read().decode(charset)
         lines = data.splitlines()
@@ -108,8 +110,10 @@ def GetItem(name, meta_file, data_file, revid, newline="\n"):
 
 
 @cli.command("item-put", help="Put an item revision into the wiki")
-@click.option("--meta", "-m", "--meta-file", type=str, required=True, help="Filename of file to read as metadata.")
-@click.option("--data", "-d", "--data-file", type=str, required=True, help="Filename of file to read as data.")
+@click.option(
+    "--meta", "-m", "--meta-file", type=str, required=True, help="Filename of the file to read for the metadata."
+)
+@click.option("--data", "-d", "--data-file", type=str, required=True, help="Filename of the file to read for the data.")
 @click.option(
     "--overwrite", "-o", is_flag=True, default=False, help="If given, overwrite existing revisions, if requested."
 )
@@ -200,7 +204,7 @@ def LoadHelp(namespace, path_to_help):
 @cli.command("dump-help", help="Dump a namespace of user help items to .data and .meta file pairs")
 @click.option("--namespace", "-n", type=str, required=True, help="Namespace to be dumped: help-common, help-en, etc.")
 @click.option("--path_to_help", "--path", "-p", type=str, help="Override output directory, default is src/moin/help")
-@click.option("--crlf/--no-crlf", help="use windows line endings in output files")
+@click.option("--crlf/--no-crlf", help="Use Windows line endings in output files")
 def DumpHelp(namespace, path_to_help, crlf):
     """
     Save an entire help namespace to the distribution source.
diff --git a/src/moin/cli/maint/reduce_revisions.py b/src/moin/cli/maint/reduce_revisions.py
index 081a66c40..be7ec5018 100644
--- a/src/moin/cli/maint/reduce_revisions.py
+++ b/src/moin/cli/maint/reduce_revisions.py
@@ -6,9 +6,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin CLI - Reduce Item Revisions
+MoinMoin - CLI command to reduce item revisions.
 
-This script removes all revisions but the last one from all selected items.
+Remove all revisions except the latest one from selected items.
 """
 
 import click
@@ -67,7 +67,7 @@ def ReduceRevisions(query, namespace, test):
         current_full_name = current_namespace + "/" + current_name[0] if current_namespace else current_name
         if test:
             print(
-                "Item named {!r} selected but not updated, has {} revisions :".format(current_full_name, current_revno)
+                "Item named {!r} selected but not updated; has {} revisions:".format(current_full_name, current_revno)
             )
         else:
             print(f"Destroying historical revisions of {current_full_name!r}:")
@@ -90,7 +90,7 @@ def ReduceRevisions(query, namespace, test):
                         # Save existing mtime which has time this revision's data was last modified.
                         flaskg.data_mtime = meta[MTIME]
                         current_rev.item.store_revision(meta, current_rev.data, overwrite=True)
-                        print("    (current rev meta data updated)")
+                        print("    (current revision metadata updated)")
                     continue
                 has_historical_revision = True
                 name = rev.meta[NAME]
diff --git a/src/moin/cli/maint/serialization.py b/src/moin/cli/maint/serialization.py
index f05a44a08..734719918 100644
--- a/src/moin/cli/maint/serialization.py
+++ b/src/moin/cli/maint/serialization.py
@@ -4,7 +4,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin CLI - backend serialization / deserialization
+MoinMoin - CLI commands to serialize and deserialize backends.
 """
 
 import sys
@@ -37,7 +37,7 @@ def open_file(filename, mode):
         else:
             raise ValueError("Invalid mode string. Must contain 'r', 'w' or 'a'")
 
-        # On Windows force the stream to be in binary mode if it's needed.
+        # On Windows, force the stream to be in binary mode if needed.
         if sys.platform == "win32" and "b" in mode:
             import os
             import msvcrt
@@ -50,7 +50,7 @@ def open_file(filename, mode):
     return f
 
 
-@cli.command("save", help="Serialize the backend into a file")
+@cli.command("save", help="Serialize the configured backend(s) to a file")
 @click.option("--file", "-f", type=str, required=False, help="Filename of the output file.")
 @click.option("--backends", "-b", type=str, required=False, help="Backend names to serialize (comma separated).")
 @click.option("--all-backends", "-a", is_flag=True, help="Serialize all configured backends.")
@@ -63,13 +63,13 @@ def Serialize(file=None, backends=None, all_backends=False):
     with f as f:
         backends = get_backends(backends, all_backends)
         for backend in backends:
-            # low level - directly serialize some backend contents -
-            # this does not use the index:
+            # Low level: directly serialize backend contents;
+            # this does not use the index.
             serialize(backend, f)
     logging.info("Backup finished")
 
 
-@cli.command("load", help="Deserialize a file into the backend; with options to rename or remove a namespace")
+@cli.command("load", help="Deserialize a file into the backend; options to rename or remove a namespace")
 @click.option("--file", "-f", type=str, required=True, help="Filename of the input file.")
 @click.option(
     "--new-ns",
@@ -77,7 +77,7 @@ def Serialize(file=None, backends=None, all_backends=False):
     type=str,
     required=False,
     default=None,
-    help="New namespace name to receive items from the old namespace name.",
+    help="New namespace to receive items from the old namespace.",
 )
 @click.option(
     "--old-ns",
@@ -85,7 +85,7 @@ def Serialize(file=None, backends=None, all_backends=False):
     type=str,
     required=False,
     default=None,
-    help="Old namespace that will be deleted, all items to be restored to new namespace.",
+    help="Old namespace whose items will be restored to the new namespace; the old namespace will be deleted.",
 )
 @click.option(
     "--kill-ns",
@@ -93,7 +93,7 @@ def Serialize(file=None, backends=None, all_backends=False):
     type=str,
     required=False,
     default=None,
-    help="Namespace name to be deleted, no items within this namespace will be loaded.",
+    help="Namespace to delete; items within this namespace will not be loaded.",
 )
 def Deserialize(file=None, new_ns=None, old_ns=None, kill_ns=None):
     logging.info("Load backup started")
diff --git a/src/moin/cli/maint/set_meta.py b/src/moin/cli/maint/set_meta.py
index 0843dd696..6e84c9aa4 100644
--- a/src/moin/cli/maint/set_meta.py
+++ b/src/moin/cli/maint/set_meta.py
@@ -6,9 +6,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin CLI - Set Metadata of a revision
+MoinMoin - CLI command to set metadata of a revision.
 
-This script duplicates the last revision of the selected item
+This command duplicates the last revision of the selected item
 and sets or removes metadata.
 """
 
@@ -36,7 +36,7 @@ def cli():
     pass
 
 
-@cli.command("maint-set-meta", help="Set meta data of a new revision")
+@cli.command("maint-set-meta", help="Set metadata of a new revision")
 @click.option("--key", "-k", required=False, type=str, help="The key you want to set/change in the new revision")
 @click.option("--value", "-v", type=str, help="The value to set for the given key.")
 @click.option(
@@ -45,7 +45,7 @@ def cli():
     is_flag=True,
     required=False,
     default=False,
-    help="If you want to delete the key given, add this flag.",
+    help="Delete the given key instead of setting a value.",
 )
 @click.option(
     "--query", "-q", type=str, default="", help="Only perform the operation on items found by the given query."
@@ -54,15 +54,13 @@ def SetMeta(key, value, remove, query):
     logging.info("Set meta started")
     flaskg.add_lineno_attr = False
     if not ((key and value) or (key and remove)) or (key and value and remove):
-        sys.exit(
-            "You need to either specify a proper key/value pair or " "only a key you want to delete (with -r set)."
-        )
+        sys.exit("You must either specify a key/value pair or a key to delete (use -r).")
 
     if not remove:
         try:
             value = literal_eval(value)
         except ValueError:
-            sys.exit("You need to specify a valid Python literal as the argument")
+            sys.exit("You need to specify a valid Python literal as the argument.")
 
     if query:
         qp = app.storage.query_parser([NAME_EXACT])
diff --git a/src/moin/cli/migration/__init__.py b/src/moin/cli/migration/__init__.py
index 6c8a8d0f9..836fc43e9 100644
--- a/src/moin/cli/migration/__init__.py
+++ b/src/moin/cli/migration/__init__.py
@@ -3,5 +3,5 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin CLI - migration scripts
+MoinMoin - CLI migration utilities.
 """
diff --git a/src/moin/cli/migration/moin19/__init__.py b/src/moin/cli/migration/moin19/__init__.py
index 6265dbee9..c687e89ba 100644
--- a/src/moin/cli/migration/moin19/__init__.py
+++ b/src/moin/cli/migration/moin19/__init__.py
@@ -3,5 +3,5 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin CLI - migration (upgrading) code for upgrades 1.9 -> 2.0
+MoinMoin - CLI migration utilities for upgrades from 1.9 to 2.0.
 """
diff --git a/src/moin/cli/migration/moin19/_logfile19.py b/src/moin/cli/migration/moin19/_logfile19.py
index b6b87aa6b..dc49fc488 100644
--- a/src/moin/cli/migration/moin19/_logfile19.py
+++ b/src/moin/cli/migration/moin19/_logfile19.py
@@ -2,9 +2,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - LogFile package
+MoinMoin - log file utilities.
 
-    This module supports buffered log reads, iterating forward and backward line-by-line, etc.
+This module supports buffered log reads and iterating forward and backward line by line.
 """
 
 
@@ -20,11 +20,11 @@
 
 
 class LogError(Exception):
-    """Base class for log errors"""
+    """Base class for log errors."""
 
 
 class LogMissing(LogError):
-    """Raised when the log is missing"""
+    """Raised when the log is missing."""
 
 
 class LineBuffer:
@@ -39,14 +39,13 @@ class LineBuffer:
 
     def __init__(self, file, offset, size, forward=True):
         """
+        TODO: when this gets refactored, don't use "file" (it's a builtin name).
 
-        TODO: when this gets refactored, don't use "file" (is a builtin)
-
-        :param file: open file object
-        :param offset: position in file to start from
-        :param size: aproximate number of bytes to read
-        :param forward : read from offset on or from offset-size to offset
-        :type forward: boolean
+        :param file: Open file object.
+        :param offset: Position in the file to start from.
+        :param size: Approximate number of bytes to read.
+        :param forward: Read from offset onward or from offset-size to offset.
+        :type forward: bool
         """
         self.loglevel = logging.NOTSET
         if forward:
diff --git a/src/moin/cli/migration/moin19/_utils19.py b/src/moin/cli/migration/moin19/_utils19.py
index ed31dd3ae..e9d7b5bdf 100644
--- a/src/moin/cli/migration/moin19/_utils19.py
+++ b/src/moin/cli/migration/moin19/_utils19.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - helpers for 1.9 migration
+MoinMoin - helpers for Moin 1.9 migration.
 """
 
 import re
@@ -11,19 +11,19 @@
 from moin.constants.contenttypes import CHARSET19
 
 
-# Precompiled patterns for file name [un]quoting
+# Precompiled patterns for filename quoting/unquoting
 UNSAFE = re.compile(r"[^a-zA-Z0-9_]+")
 QUOTED = re.compile(r"\(([a-fA-F0-9]+)\)")
 
 
 def split_body(body):
     """
-    Extract the processing instructions / acl / etc. at the beginning of a page's body.
+    Extract processing instructions, ACL, etc., at the beginning of a page's body.
 
-    Hint: if you have a Page object p, you already have the result of this function in
-          p.meta and (even better) parsed/processed stuff in p.pi.
+    Hint: If you have a Page object p, you already have the result of this function in
+          p.meta and (even better) parsed/processed content in p.pi.
 
-    Returns a list of (pi, restofline) tuples and a string with the rest of the body.
+    Return a dict of processing instructions and the rest of the body as a string.
     """
     pi = {}
     comments = []
@@ -52,7 +52,7 @@ def split_body(body):
             pi[key] = " ".join(value)
         else:
             # for keys that can't occur multiple times, don't use a list:
-            pi[key] = value[-1]  # use the last value to copy 1.9 parsing behaviour
+            pi[key] = value[-1]  # use the last value to match 1.9 parsing behavior
 
     if comments:
         body = "".join(comments) + body
@@ -62,7 +62,7 @@ def split_body(body):
 
 def add_metadata_to_body(metadata, data):
     """
-    Adds the processing instructions to the data.
+    Add processing instructions to the data.
     """
     meta_keys = [NAME, ACL, CONTENTTYPE, MTIME, LANGUAGE]
 
@@ -81,15 +81,15 @@ def add_metadata_to_body(metadata, data):
 
 def quoteWikinameFS(wikiname, charset=CHARSET19):
     """
-    Return file system representation of a Unicode WikiName.
+    Return a filesystem representation of a Unicode WikiName.
 
-    Warning: will raise UnicodeError if wikiname can not be encoded using
+    Warning: Raises UnicodeError if wikiname cannot be encoded using
     charset. The default value 'utf-8' can encode any character.
 
     :param wikiname: wiki name [unicode]
-    :param charset: charset to encode string (before quoting)
+    :param charset: charset to encode the string (before quoting)
     :rtype: string
-    :returns: quoted name, safe for any file system
+    :returns: quoted name, safe for any filesystem
     """
     filename = wikiname.encode(charset)
 
@@ -111,16 +111,16 @@ def quoteWikinameFS(wikiname, charset=CHARSET19):
 
 
 class InvalidFileNameError(Exception):
-    """Called when we find an invalid file name"""
+    """Raised when an invalid file name is encountered."""
 
     pass
 
 
 def unquoteWikiname(filename, charset=CHARSET19):
     """
-    Return Unicode WikiName from quoted file name.
+    Return a Unicode WikiName from a quoted file name.
 
-    raises an InvalidFileNameError in case of unquoting problems.
+    Raise InvalidFileNameError in case of unquoting problems.
 
     :param filename: quoted wiki name
     :param charset: charset to use for decoding (after unquoting)
@@ -143,7 +143,7 @@ def unquoteWikiname(filename, charset=CHARSET19):
                 byte = group[i : i + 2]
                 parts.append(bytes.fromhex(byte))
         except ValueError:
-            # byte not in hex, e.g 'xy'
+            # byte not in hex, e.g., 'xy'
             raise InvalidFileNameError(filename)
 
     # append rest of string
diff --git a/src/moin/cli/migration/moin19/import19.py b/src/moin/cli/migration/moin19/import19.py
index 5a80a525d..5ddf06fd5 100644
--- a/src/moin/cli/migration/moin19/import19.py
+++ b/src/moin/cli/migration/moin19/import19.py
@@ -4,7 +4,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin CLI - import content and user data from a moin 1.9 compatible storage into the moin2 storage.
+MoinMoin - import content and user data from a Moin 1.9–compatible storage into the Moin 2 storage.
 """
 
 import os
@@ -100,7 +100,7 @@ def migr_logging(msg_id, log_msg):
     """
     The logging function writes the first messages of each type
     with warning level and the rest with debug level only.
-    See contrib/logging/logfile_cli for logging configuration example
+    See contrib/logging/logfile_cli for a logging configuration example.
     """
     migr_stat[msg_id] += 1
     if migr_stat[msg_id] < migr_warn_max:
@@ -130,7 +130,7 @@ def migr_statistics(unknown_macros):
 
 
 def check_parents(item_name, namespace):
-    """Check if all parents and grandparents exist, return list of missing parent names"""
+    """Check whether all parents and grandparents exist; return a list of missing parent names."""
     global item_last
     missing_parents = set()
     parent = ParentItemName(item_name)
@@ -161,9 +161,9 @@ def add_missing_parents(missing_parents):
         logging.debug(f"missing parent added for namespace: {namespace} name: {name}")
 
 
-@cli.command("import19", help="Import content and user data from a moin 1.9 wiki")
+@cli.command("import19", help="Import content and user data from a Moin 1.9 wiki")
 @click.option(
-    "--data_dir", "-d", type=str, required=True, help="moin 1.9 data_dir (contains pages and users subdirectories)."
+    "--data_dir", "-d", type=str, required=True, help="Moin 1.9 data_dir (contains pages and users subdirectories)."
 )
 @click.option(
     "--markup_out",
@@ -171,7 +171,7 @@ def add_missing_parents(missing_parents):
     type=click.Choice(CONTENTTYPE_MARKUP_OUT.keys()),
     required=False,
     default="moinwiki",
-    help="target markup.",
+    help="Target markup.",
 )
 @click.option(
     "--namespace",
@@ -179,7 +179,7 @@ def add_missing_parents(missing_parents):
     type=str,
     required=False,
     default=NAMESPACE_DEFAULT,
-    help="target namespace, e.g. used for members of a wikifarm.",
+    help="Target namespace; for example, used for members of a wiki farm.",
 )
 @click.option(
     "--latest-rev-only",
@@ -196,10 +196,10 @@ def add_missing_parents(missing_parents):
     required=False,
     type=int,
     default=256,
-    help="Maximum memory (in megabytes) each index-writer will use for the indexing pool.",
+    help="Maximum memory (in megabytes) each index writer will use for the indexing pool.",
 )
 def ImportMoin19(data_dir=None, markup_out=None, namespace=None, procs=None, limitmb=None, latest_rev_only=False):
-    """Import content and user data from a moin wiki with version 1.9"""
+    """Import content and user data from a Moin 1.9 wiki."""
 
     target_namespace = namespace
     flaskg.add_lineno_attr = False
@@ -348,12 +348,12 @@ def ImportMoin19(data_dir=None, markup_out=None, namespace=None, procs=None, lim
 
 
 class KillRequested(Exception):
-    """raised if item killing is requested by DELETED_MODE"""
+    """Raised if item deletion is requested by DELETED_MODE."""
 
 
 class PageBackend:
     """
-    moin 1.9 page directory
+    Moin 1.9 page directory.
     """
 
     def __init__(
@@ -390,7 +390,7 @@ def __init__(
 
     def __iter__(self):
         pages_dir = os.path.join(self._path, "pages")
-        # sort by moin 1.9 directory names, non-ascii characters converted to 2 hex characters and enclosed in (..)
+        # Sort by Moin 1.9 directory names; non-ASCII characters are converted to two hex characters and enclosed in (..)
         pages = sorted(os.listdir(pages_dir))
         for f in pages:
             itemname = unquoteWikiname(f)
@@ -419,7 +419,7 @@ def __iter__(self):
 
 class PageItem:
     """
-    moin 1.9 page
+    Moin 1.9 page.
     """
 
     def __init__(self, backend, path, itemname, target_namespace, latest_rev_only=False):
@@ -639,9 +639,9 @@ def __init__(self, item, revno, path, target_namespace, latest_rev_only=False):
             last_moin19_rev[item_name] = (meta[REVID], meta[NAMESPACE])
 
     def _process_data(self, meta, data):
-        """In moin 1.x markup, not all metadata is stored in the page's header.
-        E.g. categories are stored in the footer of the page content. For
-        moin2, we extract that stuff from content and put it into metadata.
+        """In Moin 1.x markup, not all metadata is stored in the page's header.
+        For example, categories are stored in the footer of the page content. For
+        Moin 2, we extract that information from the content and put it into metadata.
         """
         if meta[CONTENTTYPE] == CONTENTTYPE_MOINWIKI:
             data = process_categories(meta, data, self.backend.item_category_regex)
@@ -691,11 +691,11 @@ def _parse_wikidict(self, content):
 
 
 def migrate_itemlinks(dom, namespace, itemlinks2chg):
-    """Walk the DOM tree and change itemlinks to users namespace
+    """Walk the DOM tree and change item links to the users namespace.
 
-    :param dom: the tree to check for elements to migrate
-    :param namespace: target namespace
-    :param itemlinks2chg: list of itemlinks to be changed
+    :param dom: The tree to check for elements to migrate.
+    :param namespace: Target namespace.
+    :param itemlinks2chg: List of item links to be changed.
     :type dom: emeraldtree.tree.Element
     """
 
diff --git a/src/moin/cli/migration/moin19/macro_migration.py b/src/moin/cli/migration/moin19/macro_migration.py
index 463d39be1..ae941e01a 100644
--- a/src/moin/cli/migration/moin19/macro_migration.py
+++ b/src/moin/cli/migration/moin19/macro_migration.py
@@ -2,47 +2,47 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin CLI - import content and user data from a moin 1.9 compatible storage into the moin2 storage.
+MoinMoin - import content and user data from a Moin 1.9–compatible storage into the Moin 2 storage.
 """
 
 from moin.utils.tree import moin_page
 
 
-# a dict of (content_type -> migration_callback)
+# A dict mapping content_type -> migration_callback.
 _migration_callbacks = {}
 
 
 def migrate_macros(dom):
-    """Walk the DOM tree and call known migration functions
+    """Walk the DOM tree and call known migration functions.
 
-    While walking the DOM tree any element of a content type
+    While walking the DOM tree, any element of a content type
     with a matching migration callback function will be passed
-    to that same function for manipulation (i.e. migration).
+    to that same function for manipulation (i.e., migration).
 
-    :param dom: the tree to check for elements to migrate
+    :param dom: The tree to check for elements to migrate.
     :type dom: emeraldtree.tree.Element
     """
 
     for node in dom.iter_elements_tree():
         if node.tag.name == "part" or node.tag.name == "inline-part":
 
-            # if a callback is registered for this content type
-            # let it manipulate the DOM node
+            # If a callback is registered for this content type,
+            # let it manipulate the DOM node.
             if node.get(moin_page.content_type) in _migration_callbacks:
                 _migration_callbacks[node.get(moin_page.content_type)](node)
 
 
 def register_macro_migration(content_type, migration_callback):
-    """Register callback for migrating elements of a certain content type
+    """Register a callback for migrating elements of a certain content type.
 
     Once registered, the migration will walk the DOM tree and use the callback
     function to manipulate elements of the given content type for migration.
 
-    :param content_type: content type that shall be passed to the callback
-                         for conversion, e.g. x-moin/macro;name=My19MacroName
+    :param content_type: Content type that shall be passed to the callback
+                         for conversion, e.g., x-moin/macro;name=My19MacroName
     :type content_type: str
-    :param migration_callback: conversion function that manipulates
-                               the DOM element in-place
+    :param migration_callback: Conversion function that manipulates
+                               the DOM element in-place.
     :type migration_callback: function(emeraldtree.tree.Element) -> None
     """
     if content_type not in _migration_callbacks:
diff --git a/src/moin/cli/migration/moin19/macros/FullSearch.py b/src/moin/cli/migration/moin19/macros/FullSearch.py
index 1d614bd79..65e9ba620 100644
--- a/src/moin/cli/migration/moin19/macros/FullSearch.py
+++ b/src/moin/cli/migration/moin19/macros/FullSearch.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin CLI - Migration of FullSearch macro (moin1.9) to new ItemList macro (moin2) if possible
+MoinMoin - migration of the FullSearch macro (Moin 1.9) to the new ItemList macro (Moin 2), if possible.
 """
 
 from moin.cli.migration.moin19 import macro_migration
@@ -14,24 +14,24 @@
 
 
 def convert_fullsearch_macro_to_item_list(node):
-    """Convert the given FullSearch macro node to an ItemList macro in-place
+    """Convert the given FullSearch macro node to an ItemList macro in-place.
 
-    The moin1.9 FullSearch macro is used in various situations. One case
-    is the listing of all pages for a specific category. In moin2, the
+    The Moin 1.9 FullSearch macro is used in various situations. One case
+    is the listing of all pages for a specific category. In Moin 2, the
     categories are replaced by tags. Therefore, all macro calls related to
-    categories are converted to the moin2 macro ItemList.
+    categories are converted to the Moin 2 macro ItemList.
 
     In all other cases, the FullSearch macro call is not changed.
     The same applies to the FullSearchCached macro.
 
     Example conversions:
 
-    | PageList macro (moin1.9)                | ItemList macro (moin2)                       |
-    |-----------------------------------------|----------------------------------------------|
-    | <<FullSearch(CategorySample)>>          | <<ItemList(item="/", tag="CategorySample")>> |
-    | <<FullSearch(category:CategorySample)>> | <<ItemList(item="/", tag="CategorySample")>> |
+    | FullSearch macro (Moin 1.9)             | ItemList macro (Moin 2)                       |
+    |-----------------------------------------|-----------------------------------------------|
+    | <<FullSearch(CategorySample)>>          | <<ItemList(item="/", tag="CategorySample")>>  |
+    | <<FullSearch(category:CategorySample)>> | <<ItemList(item="/", tag="CategorySample")>>  |
 
-    :param node: the DOM node matching the FullSearch macro content type
+    :param node: The DOM node matching the FullSearch macro content type.
     :type node: emeraldtree.tree.Element
     """
 
@@ -41,13 +41,13 @@ def convert_fullsearch_macro_to_item_list(node):
         if elem.tag.name == "arguments":
             args_before = elem.text
     if args_before and args_before.startswith("Category"):
-        # argument is a category name, lets migrate to ItemList macro
+        # Argument is a category name; we migrate to the ItemList macro.
         args_after = f'item="/", tag="{args_before}"'
     elif args_before and args_before.startswith("category:"):
-        # argument is a category name, strip keyword and migrate to ItemList macro
+        # Argument is a category name; strip the keyword and migrate to the ItemList macro.
         args_after = f'item="/", tag="{args_before[9:]}"'
     else:
-        # argument is not a category or empty, we keep the old FullSearch macro
+        # Argument is not a category or is empty; we keep the FullSearch macro unchanged.
         return
 
     # content type
diff --git a/src/moin/cli/migration/moin19/macros/MonthCalendar.py b/src/moin/cli/migration/moin19/macros/MonthCalendar.py
index a8022559d..a44ad91ea 100644
--- a/src/moin/cli/migration/moin19/macros/MonthCalendar.py
+++ b/src/moin/cli/migration/moin19/macros/MonthCalendar.py
@@ -2,11 +2,11 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin CLI - Migration of MonthCalendar macro (moin1.9) to its new syntax (moin2)
+MoinMoin - migration of the MonthCalendar macro (Moin 1.9) to its new syntax (Moin 2).
 
-The MonthCalendar macro used to have comma-separated non-name-value arguments
-such as <<MonthCalendar('TestCalendar',,,-1,,1)>>, now it has named parameters
-such as <<MonthCalendar(item='TestCalendar', offset=-1, fixed_height=true)>>
+The MonthCalendar macro used to have comma-separated, non-name-value arguments,
+such as <<MonthCalendar('TestCalendar',,,-1,,1)>>. It now uses named parameters,
+such as <<MonthCalendar(item="TestCalendar", offset=-1, fixed_height=true)>>.
 """
 from moin.cli.migration.moin19 import macro_migration
 from moin.utils import paramparser
@@ -24,11 +24,11 @@
 def parseargs_legacy(
     args, defpagename, defyear, defmonth, defoffset, defoffset2, defheight6, defanniversary, deftemplate
 ):
-    """Slightly modified parsing function from MonthCalendar.py in moin-1.9
+    """Slightly modified parsing function from MonthCalendar.py in Moin 1.9.
 
-    From the moin-1.9 version of the function
-    * the request argument was dropped
-    * get_unicode was changed to get_str
+    Changes from the Moin 1.9 version:
+    * The request argument was dropped.
+    * get_unicode was changed to get_str.
     """
     args = paramparser.parse_quoted_separated(args, name_value=False)
     args += [None] * 8  # fill up with None to trigger defaults
@@ -46,15 +46,15 @@ def parseargs_legacy(
 
 
 def convert_month_calendar_macro_syntax(node):
-    """Convert the given MonthCalendar macro node to the new syntax in-place
+    """Convert the given MonthCalendar macro node to the new syntax in-place.
 
-    MonthCalendar used to have unnamed parameters in moin-1.9. The syntax
-    has been changed to name-value parameters in moin2. Migrate the given
+    MonthCalendar used to have unnamed parameters in Moin 1.9. The syntax
+    has been changed to name-value parameters in Moin 2. Migrate the given
     macro accordingly.
 
     Example conversions:
 
-    | moin1.9                          | moin2                                |
+    | Moin 1.9                         | Moin 2                               |
     |----------------------------------|--------------------------------------|
     | <<MonthCalendar()>>              | <<MonthCalendar()>>                  |
     | <<MonthCalendar('TestPage')>>    | <<MonthCalendar(item="TestPage")>>   |
@@ -63,7 +63,7 @@ def convert_month_calendar_macro_syntax(node):
     |                                  |                 month_offset=2,      |
     |                                  |                 fixed_height=true)>> |
 
-    :param node: the DOM node matching the MonthCalendar macro content type
+    :param node: The DOM node matching the MonthCalendar macro content type.
     :type node: emeraldtree.tree.Element
     """
 
diff --git a/src/moin/cli/migration/moin19/macros/PageList.py b/src/moin/cli/migration/moin19/macros/PageList.py
index b2e532e53..70d47fec0 100644
--- a/src/moin/cli/migration/moin19/macros/PageList.py
+++ b/src/moin/cli/migration/moin19/macros/PageList.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin CLI - Migration of PageList macro (moin1.9) to new ItemList macro (moin2)
+MoinMoin - migration of the PageList macro (Moin 1.9) to the new ItemList macro (Moin 2).
 """
 
 import re
@@ -16,17 +16,17 @@
 
 
 def convert_page_list_macro_to_item_list(node):
-    """Convert the given PageList macro node to an ItemList macro in-place
+    """Convert the given PageList macro node to an ItemList macro in-place.
 
-    The moin1.0 PageList macro used to pass all arguments to the FullSearch
-    macro, so they were essentially all treated as regular expression search queries.
+    The Moin 1.x PageList macro used to pass all arguments to the FullSearch
+    macro, so they were essentially all treated as regular-expression search queries.
     After conversion to the ItemList macro, the argument will be a simple "regex" argument.
-    To make sure all available pages are searched (not only subpages of the current page)
-    the item parameter is set to empty string (item="").
+    To make sure all available pages are searched (not only subpages of the current page),
+    the item parameter is set to an empty string (item="").
 
     Example conversions:
 
-    | PageList macro (moin1.9)       | ItemList macro (moin2)            |
+    | PageList macro (Moin 1.9)      | ItemList macro (Moin 2)           |
     |--------------------------------|-----------------------------------|
     | <<PageList>>                   | <<ItemList(item="")>>             |
     | <<PageList()>>                 | <<ItemList(item="")>>             |
@@ -35,7 +35,7 @@ def convert_page_list_macro_to_item_list(node):
     | <<PageList(regex:Rnd[^abc]+)>> | <<ItemList(item="",               |
     |                                |            regex="Rnd[^abc]+")>>  |
 
-    :param node: the DOM node matching the PageList macro content type
+    :param node: The DOM node matching the PageList macro content type.
     :type node: emeraldtree.tree.Element
     """
 
@@ -50,14 +50,14 @@ def convert_page_list_macro_to_item_list(node):
         if elem.tag.name == "arguments":
             args_before = elem.text
     if args_before:
-        # strip the "regex:" prefix if necessary
+        # Strip the "regex:" prefix if present.
         args_intermediate = re.sub(r"^regex:", "", args_before)
-        # wrap argument in new keyword argument "regex"
+        # Wrap the argument in the new keyword argument "regex".
         args_after = f'item="",regex="{args_intermediate}"'
     else:
         # PageList macros without arguments used to show every
         # available page in the wiki, so it's converted to an
-        # ItemList macro with an empty string item parameter
+        # ItemList macro with an empty-string item parameter.
         args_after = 'item=""'
 
     for elem in node.iter_elements():
diff --git a/src/moin/cli/migration/moin19/macros/__init__.py b/src/moin/cli/migration/moin19/macros/__init__.py
index 17f6aca52..135f604e2 100644
--- a/src/moin/cli/migration/moin19/macros/__init__.py
+++ b/src/moin/cli/migration/moin19/macros/__init__.py
@@ -2,5 +2,5 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin CLI - macro migration
+MoinMoin - CLI migration utilities for macros.
 """
diff --git a/src/moin/cli/migration/moin19/macros/_tests/test_FullSearch_migration.py b/src/moin/cli/migration/moin19/macros/_tests/test_FullSearch_migration.py
index 04956cd5d..0380b362e 100644
--- a/src/moin/cli/migration/moin19/macros/_tests/test_FullSearch_migration.py
+++ b/src/moin/cli/migration/moin19/macros/_tests/test_FullSearch_migration.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.cli.migration.moin19.macros Test FullSearch
+MoinMoin - tests for FullSearch macro migration (moin.cli.migration.moin19.macros).
 """
 
 import pytest
@@ -24,7 +24,7 @@
     ],
 )
 def test_macro_conversion_itemlist(legacy_macro, expected_args):
-    # macro calls for Categories
+    # Macro calls for categories.
     converter = ConverterFormat19()
     dom = converter(legacy_macro, import19.CONTENTTYPE_MOINWIKI)
     migrate_macros(dom)  # in-place conversion
@@ -45,7 +45,7 @@ def test_macro_conversion_itemlist(legacy_macro, expected_args):
     ],
 )
 def test_macro_conversion_fullsearch(legacy_macro, expected_args):
-    # macro calls other than Categories are not changed
+    # Macro calls other than categories are not changed.
     converter = ConverterFormat19()
     dom = converter(legacy_macro, import19.CONTENTTYPE_MOINWIKI)
     migrate_macros(dom)  # in-place conversion
diff --git a/src/moin/cli/migration/moin19/macros/_tests/test_MonthCalendar_migration.py b/src/moin/cli/migration/moin19/macros/_tests/test_MonthCalendar_migration.py
index 257b1afc5..37536ed82 100644
--- a/src/moin/cli/migration/moin19/macros/_tests/test_MonthCalendar_migration.py
+++ b/src/moin/cli/migration/moin19/macros/_tests/test_MonthCalendar_migration.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.cli.migration.moin19.macros Test MonthCalendar
+MoinMoin - tests for MonthCalendar macro migration (moin.cli.migration.moin19.macros).
 """
 
 import pytest
diff --git a/src/moin/cli/migration/moin19/macros/_tests/test_PageList_migration.py b/src/moin/cli/migration/moin19/macros/_tests/test_PageList_migration.py
index f5b6c67db..2003dc8c8 100644
--- a/src/moin/cli/migration/moin19/macros/_tests/test_PageList_migration.py
+++ b/src/moin/cli/migration/moin19/macros/_tests/test_PageList_migration.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.cli.migration.moin19.macros Test PageList
+MoinMoin - tests for PageList macro migration (moin.cli.migration.moin19.macros).
 """
 
 import pytest
diff --git a/src/moin/config/_tests/test_defaultconfig.py b/src/moin/config/_tests/test_defaultconfig.py
index c54bdae5d..5cc38c649 100644
--- a/src/moin/config/_tests/test_defaultconfig.py
+++ b/src/moin/config/_tests/test_defaultconfig.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.config.default Tests
+MoinMoin - moin.config.default tests.
 """
 
 
@@ -17,7 +17,7 @@ class TestPasswordChecker:
         ("", False),  # empty
         ("1966", False),  # too short
         ("asdfghjk", False),  # keyboard sequence
-        ("QwertZuiop", False),  # german keyboard sequence, with uppercase
+        ("QwertZuiop", False),  # German keyboard sequence, with uppercase
         ("mnbvcx", False),  # reverse keyboard sequence
         ("12345678", False),  # keyboard sequence, too easy
         ("aaaaaaaa", False),  # not enough different chars
diff --git a/src/moin/config/default.py b/src/moin/config/default.py
index 79f88b8fb..98c383a0a 100644
--- a/src/moin/config/default.py
+++ b/src/moin/config/default.py
@@ -33,13 +33,13 @@
 
 
 class CacheClass:
-    """just a container for stuff we cache"""
+    """Just a container for stuff we cache."""
 
     pass
 
 
 class ConfigFunctionality:
-    """Configuration base class with config class behaviour.
+    """Configuration base class with config class behavior.
 
     This class contains the functionality for the DefaultConfig
     class for the benefit of the WikiConfig macro.
@@ -57,7 +57,7 @@ class for the benefit of the WikiConfig macro.
     markdown_extensions = []
 
     def __init__(self):
-        """Init Config instance"""
+        """Initialize Config instance."""
         self.cache = CacheClass()
 
         if self.config_check_enabled:
@@ -67,7 +67,7 @@ def __init__(self):
         data_dir = os.path.normpath(self.data_dir)
         self.data_dir = data_dir
 
-        # Try to decode certain names which allow unicode
+        # Try to decode certain names that allow Unicode
         self._decode()
 
         # After that, pre-compile some regexes
diff --git a/src/moin/config/wikiconfig.py b/src/moin/config/wikiconfig.py
index 64bb45ce3..4dd4eda59 100644
--- a/src/moin/config/wikiconfig.py
+++ b/src/moin/config/wikiconfig.py
@@ -57,7 +57,7 @@ class Config(DefaultConfig):
     data_dir = os.path.join(instance_dir, "data")
     index_storage = "FileStorage", (os.path.join(instance_dir, "index"),), {}
 
-    # setup moin to serve static files' or change to have your webserver serve static files
+    # Set up Moin to serve static files, or configure your web server to serve static files
     serve_files = dict(
         wiki_local=os.path.join(wikiconfig_dir, "wiki_local")  # store custom logos, CSS, templates, etc. here
     )
@@ -68,37 +68,37 @@ class Config(DefaultConfig):
         # change target if a specific release or language is available
         serve_files["external_docs"] = "https://moin-20.readthedocs.io/en/latest/"
 
-    # copy templates/snippets.html to directory below and edit per requirements to customize logos, etc.
+    # Copy templates/snippets.html to the directory below and edit as required to customize logos, etc.
     template_dirs = [os.path.join(wikiconfig_dir, "wiki_local")]
 
-    # it is required that you set interwikiname to a unique, stable and non-empty name.
+    # It is required that you set interwikiname to a unique, stable, and non-empty name.
     interwikiname = "MyMoinMoin"
-    # load the interwiki map from intermap.txt
+    # Load the interwiki map from intermap.txt
     try:
         interwiki_map = InterWikiMap.from_file(os.path.join(wikiconfig_dir, "intermap.txt")).iwmap
     except FileNotFoundError:
         interwiki_map = {}
-    # we must add entries for 'Self' and our interwikiname,
+    # We must add entries for 'Self' and our interwikiname;
     # if you are not running the built-in desktop server change these to your wiki URL
     interwiki_map[interwikiname] = "http://127.0.0.1:8080/"
     interwiki_map["Self"] = "http://127.0.0.1:8080/"
 
-    # sitename is displayed in heading of all wiki pages
+    # Sitename is displayed in the heading of all wiki pages
     sitename = "My MoinMoin"
 
-    # see https://www.moinmo.in/ThemeMarket for contributed moin2 themes
+    # See https://www.moinmo.in/ThemeMarket for contributed Moin 2 themes
     # default theme is topside
     # theme_default = "modernized"  # or basic or topside_cms
 
-    # prevent multiple users from editing an item at same time
+    # Prevent multiple users from editing an item at the same time
     edit_locking_policy = "lock"
     edit_lock_time = 20  # minutes, resets when the Preview button is clicked
 
-    # number of quicklinks to show in navigation bar, mouseover shows all
-    # only the modernized theme supports this
+    # Number of quicklinks to show in the navigation bar; mouseover shows all
+    # Only the modernized theme supports this
     expanded_quicklinks_size = 5
 
-    # read about PRIVACY ISSUES in docs before uncommenting the line below to use gravatars
+    # Read about PRIVACY ISSUES in the docs before uncommenting the line below to use Gravatars
     # user_use_gravatar = True
     # user_gravatar_default_img = "blank"  # or "mp", "identicon", "monsterid", "wavatar", "retro", "robohash".
     # you can also supply a publicly available image URL with user_gravatar_default_img,
@@ -107,7 +107,7 @@ class Config(DefaultConfig):
     # to deactivate the discussion feature uncomment the following line
     # supplementation_item_names = []
 
-    # read about SECURITY ISSUES in docs before uncommenting the line below allowing users
+    # Read about SECURITY ISSUES in the docs before uncommenting the line below that allows users
     # to edit style attributes in HTML and Markdown items
     # allow_style_attributes = True
 
diff --git a/src/moin/conftest.py b/src/moin/conftest.py
index 23909a6b7..6087ea9d8 100644
--- a/src/moin/conftest.py
+++ b/src/moin/conftest.py
@@ -26,7 +26,7 @@
 from moin.storage import create_simple_mapping
 
 
-# exclude some directories from pytest test discovery, pathes relative to this file
+# Exclude some directories from pytest test discovery; paths are relative to this file
 collect_ignore = [
     "static",  # same
     "../wiki",  # no tests there
diff --git a/src/moin/constants/__init__.py b/src/moin/constants/__init__.py
index 4a0f6fe4e..1275e4ee0 100644
--- a/src/moin/constants/__init__.py
+++ b/src/moin/constants/__init__.py
@@ -2,5 +2,5 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - modules with constant definitions
+MoinMoin - Modules with constant definitions.
 """
diff --git a/src/moin/constants/contenttypes.py b/src/moin/constants/contenttypes.py
index 326a40dba..a6513eda8 100644
--- a/src/moin/constants/contenttypes.py
+++ b/src/moin/constants/contenttypes.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - contenttype related constants
+MoinMoin - Content type–related constants.
 """
 
 from collections import defaultdict
@@ -16,7 +16,7 @@
 CHARSET = "utf-8"
 CHARSET19 = "utf-8"
 
-# Parser to use mimetype text
+# Parser-to-use MIME types
 PARSER_TEXT_MIMETYPE = [
     "plain",
     "csv",
@@ -72,7 +72,7 @@
 ]
 
 CONTENTTYPE_VARIABLES = [
-    # content types that support variables: @SIG@, @EMAIL@, @TIME@, @DATE@, etc
+    # Content types that support variables: @SIG@, @EMAIL@, @TIME@, @DATE@, etc.
     "text/x.moin.wiki;charset=utf-8",
     "text/x.moin.wiki;format=1.9;charset=utf-8",
 ]
@@ -93,7 +93,7 @@
 
 CONTENTTYPE_VIDEO = ["video/ogg", "video/webm", "video/mp4"]
 
-# TODO: is there a source that maps all (or common) file suffixes to media contenttypes as used by /maint/dump_html.py
+# TODO: is there a source that maps all (or common) file suffixes to media content types as used by /maint/dump_html.py
 CONTENTTYPE_MEDIA = CONTENTTYPE_VIDEO + CONTENTTYPE_AUDIO + CONTENTTYPE_IMAGE
 CONTENTTYPE_MEDIA_SUFFIX = tuple(
     ".svg .png .jpg .jpeg .gif .wave .wav .ogg .oga .ogv.mpeg .mpg .mp3 .webm .mp4".split()
diff --git a/src/moin/constants/forms.py b/src/moin/constants/forms.py
index ac821405d..d84994a2f 100644
--- a/src/moin/constants/forms.py
+++ b/src/moin/constants/forms.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Flatland form related constants
+MoinMoin - Flatland form-related constants.
 """
 
 # Widget types
@@ -31,5 +31,5 @@
 WIDGET_READONLY_STRING_LIST = "readonly_string_list"
 WIDGET_READONLY_ITEM_LINK_LIST = "readonly_item_link_list"
 
-# CSS Classes
+# CSS classes
 CLASS_BUTTON = "button"
diff --git a/src/moin/constants/itemtypes.py b/src/moin/constants/itemtypes.py
index 8483fc189..15cdba2a2 100644
--- a/src/moin/constants/itemtypes.py
+++ b/src/moin/constants/itemtypes.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - itemtype related constants
+MoinMoin - Item type–related constants.
 """
 
 ITEMTYPE_NONEXISTENT = "nonexistent"
diff --git a/src/moin/constants/keys.py b/src/moin/constants/keys.py
index b54414e03..e262a2b96 100644
--- a/src/moin/constants/keys.py
+++ b/src/moin/constants/keys.py
@@ -2,13 +2,13 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - meta data key / index field name related constants
+MoinMoin - Metadata key and index field name constants.
 """
 
-# metadata keys
+# Metadata keys
 NAME = "name"  # a list of strings, not useful for searching nor sorting, see #364
-NAMES = "names"  # fullnames of item separated by |, useful for indexing/searching/display
-NAME_SORT = "name_sort"  # useful for sorting, slashes removed because of whoosh, see #209
+NAMES = "names"  # full names of the item separated by |, useful for indexing/searching/display
+NAME_SORT = "name_sort"  # useful for sorting, slashes removed because of Whoosh, see #209
 NAME_OLD = "name_old"
 NAMESPACE = "namespace"
 
@@ -48,9 +48,9 @@
 SUMMARY = "summary"
 TRASH = "trash"
 
-# we need a specific hash algorithm to store hashes of revision data into meta
-# data. meta[HASH_ALGORITHM] = hash(rev_data, HASH_ALGORITHM)
-# some backends may use this also for other purposes.
+# We need a specific hash algorithm to store hashes of revision data into
+# the item metadata. meta[HASH_ALGORITHM] = hash(rev_data, HASH_ALGORITHM)
+# Some backends may also use this for other purposes.
 HASH_ALGORITHM = "sha1"
 HASH_LEN = 40  # length of hex str representation of hash value
 
@@ -90,10 +90,10 @@
     REV_NUMBER,
 ]
 
-# magic REVID for current revision:
+# Magic REVID for current revision:
 CURRENT = "current"
 
-# stuff from user profiles / for whoosh index
+# Stuff from user profiles / for Whoosh index
 EMAIL = "email"
 DISPLAY_NAME = "display_name"
 THEME_NAME = "theme_name"
@@ -107,7 +107,7 @@
 QUICKLINKS = "quicklinks"
 SESSION_KEY = "session_key"
 SESSION_TOKEN = "session_token"
-RECOVERPASS_KEY = "recoverpass_key"  # TODO: this is used for email confirmation as well, maybe it needs better name
+RECOVERPASS_KEY = "recoverpass_key"  # TODO: this is used for email confirmation as well; maybe it needs a better name
 EDIT_ON_DOUBLECLICK = "edit_on_doubleclick"
 SCROLL_PAGE_AFTER_EDIT = "scroll_page_after_edit"
 SHOW_COMMENTS = "show_comments"
@@ -167,7 +167,7 @@
 ELEMENT = "element"
 REPLY_TO = "reply_to"
 
-# index names
+# Index names
 LATEST_REVS = "latest_revs"
 ALL_REVS = "all_revs"
 LATEST_META = "latest_meta"
@@ -180,7 +180,7 @@
 ACTION_RENAME = "RENAME"
 ACTION_CONVERT = "CONVERT"
 
-# defaul LOCALE key value
+# Default LOCALE key value
 DEFAULT_LOCALE = "en"
 
 # key for composite name
diff --git a/src/moin/constants/misc.py b/src/moin/constants/misc.py
index 9be8ecaf0..6174ae4c8 100644
--- a/src/moin/constants/misc.py
+++ b/src/moin/constants/misc.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - misc. constants not fitting elsewhere
+MoinMoin - Miscellaneous constants not fitting elsewhere.
 """
 
 from __future__ import annotations
@@ -22,14 +22,14 @@
     \u202A | # LRE
     \u202B | # RLE
     \u202C | # PDF
-    \u202D | # LRM
-    \u202E   # RLM
+    \u202D | # LRO
+    \u202E   # RLO
     """,
     re.UNICODE | re.VERBOSE,
 )
 
 CLEAN_INPUT_TRANSLATION_MAP: dict[int, str | None] = {
-    # these chars will be replaced by blanks
+    # These characters will be replaced by blanks
     ord("\t"): " ",
     ord("\r"): " ",
     ord("\n"): " ",
@@ -38,7 +38,7 @@
     "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0b\x0c\x0e\x0f\x10\x11"
     "\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
 ):
-    # these chars will be removed
+    # These characters will be removed
     CLEAN_INPUT_TRANSLATION_MAP[ord(c)] = None
 del c
 
@@ -78,7 +78,7 @@
 # very short flash message.
 FLASH_REPEAT = "flash_repeat"
 
-# Iconclass to endpoint mapping used in navibars
+# Icon class to endpoint mapping used in navbars
 ICON_MAP = {
     "admin.index": "fa fa-cog",
     "admin.index_user": "fa fa-user",
diff --git a/src/moin/constants/namespaces.py b/src/moin/constants/namespaces.py
index 9c26eb8cc..2d554924f 100644
--- a/src/moin/constants/namespaces.py
+++ b/src/moin/constants/namespaces.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - namespaces related constants
+MoinMoin - Namespace-related constants.
 """
 
 NAMESPACE_DEFAULT = ""
@@ -11,5 +11,5 @@
 NAMESPACE_USERS = "users"
 NAMESPACE_HELP_COMMON = "help-common"
 NAMESPACE_HELP_EN = "help-en"
-NAMESPACE_ALL = "all"  # An identifier namespace which acts like a union of all the namespaces.
+NAMESPACE_ALL = "all"  # Identifier namespace acting as a union of all namespaces.
 NAMESPACES_IDENTIFIER = [NAMESPACE_ALL]  # List containing all the identifier namespaces.
diff --git a/src/moin/constants/rights.py b/src/moin/constants/rights.py
index a1f1cffca..ba0b11c96 100644
--- a/src/moin/constants/rights.py
+++ b/src/moin/constants/rights.py
@@ -3,10 +3,10 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - ACL related constants
+MoinMoin - ACL-related constants.
 """
 
-# ACL rights that are valid in moin2
+# ACL rights that are valid in Moin 2
 
 # superuser enables access to some critical functionality,
 # it is not related to CONTENT rights.
@@ -20,7 +20,7 @@
 ADMIN = "admin"
 
 # read means to be able to read revision data, unconditionally
-# TODO: define revision meta read behaviour
+# TODO: define revision meta read behavior
 READ = "read"
 
 # pubread means to be able to read revision data when published
diff --git a/src/moin/constants/tools/chartypes_create.py b/src/moin/constants/tools/chartypes_create.py
index 198f50097..e9c1d3b6c 100644
--- a/src/moin/constants/tools/chartypes_create.py
+++ b/src/moin/constants/tools/chartypes_create.py
@@ -2,8 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    Build moin.constants.chartypes with
-    UCS-2 character types (upper/lower/digits/spaces).
+Build moin.constants.chartypes with UCS-2 character types (upper, lower, digits, spaces).
 """
 
 
diff --git a/src/moin/contrib/__init__.py b/src/moin/contrib/__init__.py
index 5e14c1cfa..311fadfb6 100644
--- a/src/moin/contrib/__init__.py
+++ b/src/moin/contrib/__init__.py
@@ -2,5 +2,5 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - contributed scripts
+MoinMoin - contributed scripts.
 """
diff --git a/src/moin/contrib/wsgi/moin2wsgi.py b/src/moin/contrib/wsgi/moin2wsgi.py
index 8cad85795..f7e56c414 100644
--- a/src/moin/contrib/wsgi/moin2wsgi.py
+++ b/src/moin/contrib/wsgi/moin2wsgi.py
@@ -2,14 +2,14 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - mod_wsgi driver script
+MoinMoin - mod_wsgi driver script.
 
-    To use this, copy this file to your wiki root (wikiconfig.py resides there),
-    then add these statements to your Apache's VirtualHost definition:
+To use this, copy this file to your wiki root (where wikiconfig.py resides),
+then add these statements to your Apache VirtualHost configuration:
 
-    WSGIScriptAlias / /<path-to>/moin2wsgi.py
-    moin-wsgi user=someuser group=somegroup processes=5 threads=10 maximum-requests=1000 umask=0007
-    WSGIProcessGroup moin-wsgi
+WSGIScriptAlias / /<path-to>/moin2wsgi.py
+moin-wsgi user=someuser group=somegroup processes=5 threads=10 maximum-requests=1000 umask=0007
+WSGIProcessGroup moin-wsgi
 """
 
 import sys
@@ -24,8 +24,8 @@
 
 wiki_config = moin_dir + "/wikiconfig.py"
 
-# create the Moin (Flask) WSGI application
+# Create the Moin (Flask) WSGI application.
 application = create_app(wiki_config)
 
-# if you want to do some wsgi app wrapping, do it like shown below:
+# If you want to wrap the WSGI app, do it as shown below:
 # application.wsgi_app = somewrapper(application.wsgi_app)
diff --git a/src/moin/converters/__init__.py b/src/moin/converters/__init__.py
index d9c51beb7..a784e63bd 100644
--- a/src/moin/converters/__init__.py
+++ b/src/moin/converters/__init__.py
@@ -4,15 +4,15 @@
 """
 MoinMoin - Converter support
 
-Converters are used to convert between formats or between different featuresets
+Converters are used to convert between formats or between different feature sets
 of one format.
 
 There are usually three types of converters:
 
-- Between an input format like Moin Wiki or Creole and the internal tree
+- Between an input format like MoinWiki or Creole and the internal tree
   representation.
 - Between the internal tree and an output format like HTML.
-- Between different featuresets of the internal tree representation like URI
+- Between different feature sets of the internal tree representation like URI
   types or macro expansion.
 
 TODO: Merge with new-style macros.
@@ -48,9 +48,9 @@ def __lt__(self, other):
 
     def register(self, factory, type_input, type_output, priority=RegistryBase.PRIORITY_MIDDLE):
         """
-        Register a factory
+        Register a factory.
 
-        :param factory: Factory to register. Callable, must return an object.
+        :param factory: Factory to register. Callable; must return an object.
         """
         return self._register(self.Entry(factory, type_input, type_output, priority))
 
diff --git a/src/moin/converters/_args.py b/src/moin/converters/_args.py
index f2b99f19d..904770d4a 100644
--- a/src/moin/converters/_args.py
+++ b/src/moin/converters/_args.py
@@ -2,13 +2,13 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Arguments wrapper
+MoinMoin - Arguments wrapper.
 """
 
 
 class Arguments:
     """
-    Represent an argument list that may contain positional or keyword args.
+    Represent an argument list that may contain positional and keyword arguments.
     """
 
     __slots__ = "positional", "keyword"
@@ -19,13 +19,13 @@ def __init__(self, positional=None, keyword=None):
 
     def __contains__(self, key):
         """
-        Check for positional argument or keyword key presence.
+        Check for the presence of a positional argument or a keyword key.
         """
         return key in self.positional or key in self.keyword
 
     def __getitem__(self, key):
         """
-        Access positional arguments by index or keyword args by key name.
+        Access positional arguments by index or keyword arguments by key name.
         """
         if isinstance(key, (int, slice)):
             return self.positional[key]
diff --git a/src/moin/converters/_args_wiki.py b/src/moin/converters/_args_wiki.py
index 790504e7f..88fc108c2 100644
--- a/src/moin/converters/_args_wiki.py
+++ b/src/moin/converters/_args_wiki.py
@@ -81,11 +81,11 @@
 
 def parse(input, parse_re=parse_re):
     """
-    Parse <input> for positional and keyword arguments, with value quoting and quotes escaping.
+    Parse input for positional and keyword arguments, with value quoting and quote escaping.
 
-    :param input: with default parse_re, can be like: a b c d=e f="g h" i='j k' l="\"m\" n" o='\'p\' q'
-    :param parse_re: a compiled re pattern or None
-    :returns: Argument instance
+    :param input: with the default parse_re, can be like: a b c d=e f="g h" i='j k' l="\"m\" n" o='\'p\' q'
+    :param parse_re: a compiled regular expression or None
+    :returns: Arguments instance
     """
     ret = Arguments()
     for match in parse_re.finditer(input):
@@ -111,12 +111,12 @@ def parse(input, parse_re=parse_re):
 
 def unparse(args):
     """
-    Generate a argument string from a Argument instance <args>.
+    Generate an argument string from an Arguments instance.
     Argument values that need quoting will be quoted.
     Keyword names must never need quoting (would raise ValueError).
 
-    :param args: Argument instance
-    :returns: argument unicode object
+    :param args: Arguments instance
+    :returns: argument Unicode string
     """
 
     def quote(s):
diff --git a/src/moin/converters/_table.py b/src/moin/converters/_table.py
index d13278c2a..4ee2ccf54 100644
--- a/src/moin/converters/_table.py
+++ b/src/moin/converters/_table.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - table data to DOM conversion support
+MoinMoin - table data-to-DOM conversion support.
 """
 
 from moin.utils.tree import moin_page
diff --git a/src/moin/converters/_tests/__init__.py b/src/moin/converters/_tests/__init__.py
index 250608449..c1a491733 100644
--- a/src/moin/converters/_tests/__init__.py
+++ b/src/moin/converters/_tests/__init__.py
@@ -1,14 +1,19 @@
+"""
+Helper utilities for converter tests.
+"""
+
 import re
 from io import StringIO
 
 
 def serialize(elem, **options):
+    """Serialize an element to a string."""
     with StringIO() as buffer:
         elem.write(buffer.write, **options)
         return buffer.getvalue()
 
 
-# use non-greedy match for "..." part!
+# Use a non-greedy match for the '...' part.
 XMLNS_RE = re.compile(r'\s+xmlns(:\S+)?="[^"]+?"')
 XMLNS_RE2 = re.compile(r'(\s+xmlns(:\w+)?="[^"]+?"|xmlns\(\w+=[^)]+?\)\s+)')
 XMLNS_RE3 = re.compile(r'\s+xmlns="[^"]+?"')
diff --git a/src/moin/converters/_tests/test__args.py b/src/moin/converters/_tests/test__args.py
index b060416cb..33b2f9300 100644
--- a/src/moin/converters/_tests/test__args.py
+++ b/src/moin/converters/_tests/test__args.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.converters._args
+MoinMoin - moin.converters._args tests.
 """
 
 
diff --git a/src/moin/converters/_tests/test__args_wiki.py b/src/moin/converters/_tests/test__args_wiki.py
index 68bbb825c..52b57b2b4 100644
--- a/src/moin/converters/_tests/test__args_wiki.py
+++ b/src/moin/converters/_tests/test__args_wiki.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.converters._args_wiki
+MoinMoin - moin.converters._args_wiki tests.
 """
 
 import pytest
diff --git a/src/moin/converters/_tests/test__wiki_macro.py b/src/moin/converters/_tests/test__wiki_macro.py
index 41095eda2..3ee5be998 100644
--- a/src/moin/converters/_tests/test__wiki_macro.py
+++ b/src/moin/converters/_tests/test__wiki_macro.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.converters._wiki_macro
+MoinMoin - moin.converters._wiki_macro tests.
 """
 
 import pytest
diff --git a/src/moin/converters/_tests/test_creole_in.py b/src/moin/converters/_tests/test_creole_in.py
index 15d5d0d75..12793aed4 100644
--- a/src/moin/converters/_tests/test_creole_in.py
+++ b/src/moin/converters/_tests/test_creole_in.py
@@ -49,7 +49,7 @@ def setup_class(self):
             "[[xmpp:room@conference.example.com?join|the chatroom]]",
             '<page><body><p><a xlink:href="xmpp:room@conference.example.com?join">the chatroom</a></p></body></page>',
         ),
-        # garbage input defaults to wiki.local name
+        # Garbage input defaults to a wiki.local name
         (
             "[[invalid:fred@flinstones.org|drop me a note]]",
             '<page><body><p><a xlink:href="wiki.local:invalid:fred@flinstones.org">drop me a note</a></p></body></page>',
diff --git a/src/moin/converters/_tests/test_csv_in.py b/src/moin/converters/_tests/test_csv_in.py
index b665f1ee1..ca30be4c4 100644
--- a/src/moin/converters/_tests/test_csv_in.py
+++ b/src/moin/converters/_tests/test_csv_in.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.converters.text_csv_in
+MoinMoin - moin.converters.text_csv_in tests.
 """
 
 import pytest
@@ -23,12 +23,12 @@ def setup_class(self):
         self.conv = Converter()
 
     data = [
-        # first row not recognized as a header by Python csv module
+        # First row not recognized as a header by Python csv module
         (
             "Head A,Head B\na,bb\nccc,dddd",
             "<page><body><table><table-body><table-row><table-cell>Head A</table-cell><table-cell>Head B</table-cell></table-row><table-row><table-cell>a</table-cell><table-cell>bb</table-cell></table-row><table-row><table-cell>ccc</table-cell><table-cell>dddd</table-cell></table-row></table-body></table></body></page>",
         ),
-        # first row recognized as header
+        # First row recognized as header
         (
             "Head A;Head B\n1;2\n3;4",
             '<page><body><table class="moin-sortable"><table-header><table-row><table-cell class="moin-integer">Head A</table-cell><table-cell class="moin-integer">Head B</table-cell></table-row></table-header><table-body><table-row><table-cell class="moin-integer">1</table-cell><table-cell class="moin-integer">2</table-cell></table-row><table-row><table-cell class="moin-integer">3</table-cell><table-cell class="moin-integer">4</table-cell></table-row></table-body></table></body></page>',
diff --git a/src/moin/converters/_tests/test_docbook_in.py b/src/moin/converters/_tests/test_docbook_in.py
index 4dbaba0ed..3d9ec4e1f 100644
--- a/src/moin/converters/_tests/test_docbook_in.py
+++ b/src/moin/converters/_tests/test_docbook_in.py
@@ -55,14 +55,14 @@ def handle_output(self, input, **args):
 
     def do(self, input, xpath_query):
         string_to_parse = self.handle_output(input)
-        logging.debug(f"After the DOCBOOK_IN conversion : {string_to_parse}")
+        logging.debug(f"After the DocBook in conversion: {string_to_parse}")
         tree = etree.parse(StringIO(string_to_parse))
         print("string_to_parse = %s" % string_to_parse)  # provide a clue for failing tests
         assert tree.xpath(xpath_query, namespaces=self.namespaces_xpath)
 
     def do_nonamespace(self, input, xpath_query):
         string_to_parse = self.handle_output(input, nonamespace=True)
-        logging.debug(f"After the DOCBOOK_IN conversion : {string_to_parse}")
+        logging.debug(f"After the DocBook in conversion: {string_to_parse}")
         tree = etree.parse(StringIO(string_to_parse))
         assert tree.xpath(xpath_query, namespaces=self.namespaces_xpath)
 
diff --git a/src/moin/converters/_tests/test_docbook_out.py b/src/moin/converters/_tests/test_docbook_out.py
index 66884f0b2..430e71cf1 100644
--- a/src/moin/converters/_tests/test_docbook_out.py
+++ b/src/moin/converters/_tests/test_docbook_out.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.converters.docbook_out
+MoinMoin - moin.converters.docbook_out tests.
 """
 
 from io import StringIO
diff --git a/src/moin/converters/_tests/test_everything.py b/src/moin/converters/_tests/test_everything.py
index f56bf085f..6ad338804 100644
--- a/src/moin/converters/_tests/test_everything.py
+++ b/src/moin/converters/_tests/test_everything.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.converters.everything
+MoinMoin - moin.converters.everything tests.
 """
 
 import pytest
diff --git a/src/moin/converters/_tests/test_html_in.py b/src/moin/converters/_tests/test_html_in.py
index 56ea2a7c1..65586e7fa 100644
--- a/src/moin/converters/_tests/test_html_in.py
+++ b/src/moin/converters/_tests/test_html_in.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.converters.html_in
+MoinMoin - moin.converters.html_in tests.
 """
 
 
diff --git a/src/moin/converters/_tests/test_html_in_out.py b/src/moin/converters/_tests/test_html_in_out.py
index 96dedbb28..04989e388 100644
--- a/src/moin/converters/_tests/test_html_in_out.py
+++ b/src/moin/converters/_tests/test_html_in_out.py
@@ -4,7 +4,7 @@
 """
 MoinMoin - Tests for moin.converters.html_in and moin.converters.html_out.
 
-           It will check that roundtrip conversion is working well.
+           It checks that round-trip conversion works correctly.
 """
 
 
diff --git a/src/moin/converters/_tests/test_html_out.py b/src/moin/converters/_tests/test_html_out.py
index f8a75587e..8ebef3b60 100644
--- a/src/moin/converters/_tests/test_html_out.py
+++ b/src/moin/converters/_tests/test_html_out.py
@@ -44,7 +44,7 @@ def handle_output(self, elem, **options):
     def do(self, input, xpath, args={}):
         out = self.conv(self.handle_input(input), **args)
         string_to_parse = self.handle_output(out)
-        logging.debug(f"After the HTML_OUT conversion : {string_to_parse}")
+        logging.debug(f"After the HTML out conversion: {string_to_parse}")
         tree = etree.parse(StringIO(string_to_parse))
         assert tree.xpath(xpath)
 
diff --git a/src/moin/converters/_tests/test_image.py b/src/moin/converters/_tests/test_image.py
index eb8ff2bcc..cedc676d4 100644
--- a/src/moin/converters/_tests/test_image.py
+++ b/src/moin/converters/_tests/test_image.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.converters for different imagetypes
+MoinMoin - Tests for moin.converters for different image types.
 """
 
 import pytest
@@ -23,7 +23,7 @@ def run_test(tree_xml, output):
 
 @pytest.mark.parametrize("img_type", ["image/jpeg", "image/svg+xml", "image/png", "image/gif"])
 def test_image(img_type):
-    """Tests if a set of imagetypes, result inside an img tag"""
+    """Test whether a set of image types results in an img tag."""
     tree_xml = (
         '<ns0:page ns0:page-href="wiki:///Home" xmlns:ns0="http://moinmo.in/namespaces/page" '
         'xmlns:ns1="http://www.w3.org/2001/XInclude" xmlns:ns2="http://www.w3.org/1999/xhtml" '
@@ -43,7 +43,7 @@ def test_image(img_type):
 
 
 def test_resize():
-    """Tests if resize attributes convert to respective html tag resize attributes"""
+    """Test whether resize attributes convert to the respective HTML tag resize attributes."""
     image_resize = (
         '<ns0:page xmlns:ns0="http://moinmo.in/namespaces/page" '
         'xmlns:ns2="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1999/xlink">'
diff --git a/src/moin/converters/_tests/test_include.py b/src/moin/converters/_tests/test_include.py
index ad4fc75c7..d8093b711 100644
--- a/src/moin/converters/_tests/test_include.py
+++ b/src/moin/converters/_tests/test_include.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.converters.include
+MoinMoin - moin.converters.include tests.
 """
 
 
@@ -15,7 +15,7 @@
 class TestInclude:
     class Config(wikiconfig.Config):
         """
-        we just have this so the test framework creates a new app with empty backends for us.
+        We include this so the test framework creates a new app with empty backends for us.
         """
 
     def test_XPointer(self):
@@ -63,18 +63,18 @@ def test_XPointer(self):
         assert e.data == "a(b)"
 
     def test_IncludeHandlesCircularRecursion(self):
-        # detect circular recursion and create error message
+        # Detect circular recursion and create an error message.
         update_item("page1", {CONTENTTYPE: "text/x.moin.wiki;charset=utf-8"}, "{{page2}}")
         update_item("page2", {CONTENTTYPE: "text/x.moin.wiki;charset=utf-8"}, "{{page3}}")
         update_item("page3", {CONTENTTYPE: "text/x.moin.wiki;charset=utf-8"}, "{{page4}}")
         update_item("page4", {CONTENTTYPE: "text/x.moin.wiki;charset=utf-8"}, "{{page2}}")
         page1 = Item.create("page1")
         rendered = page1.content._render_data()
-        # an error message will follow strong tag
+        # An error message will follow the strong tag.
         assert '<strong class="moin-error">' in rendered
 
     def test_Include_Read_Permission_Denied(self):
-        # attempt to include an item that user cannot read
+        # Attempt to include an item the user cannot read.
         update_item(
             "page1",
             {CONTENTTYPE: "text/x.moin.wiki;charset=utf-8", ACL: "All:write,create,admin,destroy"},
@@ -83,25 +83,25 @@ def test_Include_Read_Permission_Denied(self):
         update_item("page2", {CONTENTTYPE: "text/x.moin.wiki;charset=utf-8"}, "some text{{page1}}more text")
         page2 = Item.create("page2")
         rendered = page2.content._render_data()
-        # an error message will follow p tag, similar to: Access Denied, transcluded content suppressed.
+        # An error message will follow the p tag, similar to: Access Denied, transcluded content suppressed.
         assert '<div class="warning moin-read-denied"><p>' in rendered
 
     def test_ExternalInclude(self):
-        # external include
+        # External include.
         update_item("page1", {CONTENTTYPE: "text/x.moin.wiki;charset=utf-8"}, "{{http://moinmo.in}}")
         rendered = Item.create("page1").content._render_data()
         assert (
             '<object class="moin-transclusion" data="http://moinmo.in" data-href="http://moinmo.in">http://moinmo.in</object>'
             in rendered
         )
-        # external include embedded within text (object is an inline tag)
+        # External include embedded within text (object is an inline tag).
         update_item("page1", {CONTENTTYPE: "text/x.moin.wiki;charset=utf-8"}, "before {{http://moinmo.in}} after")
         rendered = Item.create("page1").content._render_data()
         assert (
             '<p>before <object class="moin-transclusion" data="http://moinmo.in" data-href="http://moinmo.in">http://moinmo.in</object> after</p>'
             in rendered
         )
-        # external include embedded within text italic and bold markup (object is an inline tag)
+        # External include embedded within italic and bold text markup (object is an inline tag).
         update_item(
             "page1",
             {CONTENTTYPE: "text/x.moin.wiki;charset=utf-8"},
diff --git a/src/moin/converters/_tests/test_link.py b/src/moin/converters/_tests/test_link.py
index 3351b75d1..98b36f4b2 100644
--- a/src/moin/converters/_tests/test_link.py
+++ b/src/moin/converters/_tests/test_link.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.converters.link
+MoinMoin - moin.converters.link tests.
 """
 
 from emeraldtree import ElementTree as ET
diff --git a/src/moin/converters/_tests/test_markdown_in.py b/src/moin/converters/_tests/test_markdown_in.py
index af7d5166c..dcb73152e 100644
--- a/src/moin/converters/_tests/test_markdown_in.py
+++ b/src/moin/converters/_tests/test_markdown_in.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.converters.markdown_in
+MoinMoin - moin.converters.markdown_in tests.
 """
 
 from collections import namedtuple
@@ -27,9 +27,10 @@ class TestConverter:
     output_re = XMLNS_RE
 
     def setup_class(self):
-        # mock patching flask.current_app.cfg does not work here as for speccing the original object is called and that causes a "RuntimeError: working outside of application context"
+        # Mock-patching flask.current_app.cfg does not work here because the original object is called for spec'ing,
+        # which causes a "RuntimeError: working outside of application context".
         app = Flask(__name__)
-        # DefaultConfig doesn't work here as it does not provide all the defaults required to be initialized
+        # DefaultConfig alone does not work here, as it does not provide all the defaults required to initialize.
         app.cfg = config
         ctx = app.app_context()
         ctx.push()
diff --git a/src/moin/converters/_tests/test_markdown_in_out.py b/src/moin/converters/_tests/test_markdown_in_out.py
index e46f35d75..fd6b5b8d3 100644
--- a/src/moin/converters/_tests/test_markdown_in_out.py
+++ b/src/moin/converters/_tests/test_markdown_in_out.py
@@ -4,7 +4,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for markdown->DOM->markdown using markdown_in and markdown_out converters
+MoinMoin - Tests for Markdown->DOM->Markdown using markdown_in and markdown_out converters
 """
 
 from collections import namedtuple
diff --git a/src/moin/converters/_tests/test_mediawiki_in.py b/src/moin/converters/_tests/test_mediawiki_in.py
index ce5ede9eb..04552b22a 100644
--- a/src/moin/converters/_tests/test_mediawiki_in.py
+++ b/src/moin/converters/_tests/test_mediawiki_in.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.converters.mediawiki_in
+MoinMoin - moin.converters.mediawiki_in tests.
 """
 
 import pytest
diff --git a/src/moin/converters/_tests/test_moinwiki19_in.py b/src/moin/converters/_tests/test_moinwiki19_in.py
index 4b70e512b..864fd1bdc 100644
--- a/src/moin/converters/_tests/test_moinwiki19_in.py
+++ b/src/moin/converters/_tests/test_moinwiki19_in.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.converters.moinwiki19_in
+MoinMoin - moin.converters.moinwiki19_in tests.
 """
 
 
@@ -30,13 +30,13 @@ def setup_class(self):
             "http://moinmo.in/",
             '<page><body><p><a xlink:href="http://moinmo.in/">http://moinmo.in/</a></p></body></page>',
         ),
-        # email tests
+        # Email tests
         (
             "mailto:foo@bar.baz",
             '<page><body><p><a xlink:href="mailto:foo@bar.baz">mailto:foo@bar.baz</a></p></body></page>',
         ),
         ("foo@bar.baz", '<page><body><p><a xlink:href="mailto:foo@bar.baz">foo@bar.baz</a></p></body></page>'),
-        ("foo@bar", "<page><body><p>foo@bar</p></body></page>"),  # 1.9 requires domain
+        ("foo@bar", "<page><body><p>foo@bar</p></body></page>"),  # Moin 1.9 requires a domain
     ]
 
     @pytest.mark.parametrize("input,output", data)
diff --git a/src/moin/converters/_tests/test_moinwiki19_in_20_out.py b/src/moin/converters/_tests/test_moinwiki19_in_20_out.py
index c3186f9e4..3b8549477 100644
--- a/src/moin/converters/_tests/test_moinwiki19_in_20_out.py
+++ b/src/moin/converters/_tests/test_moinwiki19_in_20_out.py
@@ -45,10 +45,10 @@ def setup_class(self):
         self.conv_out = conv_out()
 
     data = [
-        # Note: old style attachments are are supported in moinwiki_in so conversion to moin 2 markup is not necessary
-        # TODO: in a perfect world, moinwiki19_in should convert attachments
+        # Note: old-style attachments are supported in moinwiki_in, so conversion to Moin 2 markup is not necessary
+        # TODO: In a perfect world, moinwiki19_in should convert attachments
         ("[[attachment:filename.txt]]", "[[/filename.txt]]\n"),
-        # moin 1.9 to 2.0 conversion
+        # Moin 1.9 to 2.0 conversion
         ("TestPage", "[[TestPage]]\n"),
         # ('../SisterPage', '[[../SisterPage]]\n'),
     ]
diff --git a/src/moin/converters/_tests/test_moinwiki_in.py b/src/moin/converters/_tests/test_moinwiki_in.py
index a4dad6f01..a18d15897 100644
--- a/src/moin/converters/_tests/test_moinwiki_in.py
+++ b/src/moin/converters/_tests/test_moinwiki_in.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.converters.moinwiki_in
+MoinMoin - moin.converters.moinwiki_in tests.
 """
 
 
@@ -54,7 +54,7 @@ def setup_class(self):
             "{{somelocalimage|my alt text|width=10, height=10}}",
             '<page><body><p><xinclude:include xhtml:alt="my alt text" xhtml:height="10" xhtml:width="10" xinclude:href="wiki.local:somelocalimage?" /></p></body></page>',
         ),
-        # html5 requires img tags to have an alt attribute, html_out.py will add any required attributes that are missing
+        # HTML5 requires img tags to have an alt attribute; html_out.py will add any required attributes that are missing
         (
             "{{somelocalimage||width=10, height=10}}",
             '<page><body><p><xinclude:include xhtml:height="10" xhtml:width="10" xinclude:href="wiki.local:somelocalimage?" /></p></body></page>',
@@ -71,7 +71,7 @@ def setup_class(self):
             "before {{http://moinmo.in}} middle {{http://moinmo.in}} after",
             '<page><body><p>before <object xlink:href="http://moinmo.in" /> middle <object xlink:href="http://moinmo.in" /> after</p></body></page>',
         ),
-        # in html5, object tags must not have alt attributes, html_out.py will adjust this so alt text is placed before the </object>
+        # In HTML5, object tags must not have alt attributes; html_out.py will adjust this so alt text is placed before the </object>
         (
             "{{http://moinmo.in/|test|width=10, height=10}}",
             '<page><body><p><object xhtml:alt="test" xhtml:height="10" xhtml:width="10" xlink:href="http://moinmo.in/" /></p></body></page>',
@@ -128,7 +128,7 @@ def test_emphasis(self, input, output):
 
     data = [
         (
-            "=Not_a_Heading=",  # this is for better moin 1.x compatibility
+            "=Not_a_Heading=",  # this is for better Moin 1.x compatibility
             "<page><body><p>=Not_a_Heading=</p></body></page>",
         ),
         ("= Heading 1 =", '<page><body><h outline-level="1">Heading 1</h></body></page>'),
@@ -241,7 +241,7 @@ def test_list(self, input, output):
             "<<Macro(arg)>>",
             '<page><body><part alt="&lt;&lt;Macro(arg)&gt;&gt;" content-type="x-moin/macro;name=Macro"><arguments>arg</arguments></part></body></page>',
         ),
-        # these macro tests copied from test_creole_in, next test is different because leading space creates unordered list in moin2
+        # These macro tests were copied from test_creole_in. The next test is different because a leading space creates an unordered list in Moin 2
         (
             " <<Macro>> ",
             '<page><body><list item-label-generate="unordered" list-style-type="no-bullet"><list-item><list-item-body><part alt="&lt;&lt;Macro&gt;&gt;" content-type="x-moin/macro;name=Macro" /></list-item-body></list-item></list></body></page>',
@@ -327,7 +327,7 @@ def test_table_links(self, input, output):
         self.do(input, output)
 
     data = [
-        # a class of moin-wiki-table is added to all tables, html_out may create thead and tfoot tags
+        # A class of moin-wiki-table is added to all tables; html_out may create thead and tfoot tags.
         (
             "||||Span||\n\n",
             '<page><body><table class="moin-wiki-table"><table-body><table-row><table-cell number-columns-spanned="2">Span</table-cell></table-row></table-body></table></body></page>',
diff --git a/src/moin/converters/_tests/test_moinwiki_in_out.py b/src/moin/converters/_tests/test_moinwiki_in_out.py
index 3e47dd577..4b4921c5f 100644
--- a/src/moin/converters/_tests/test_moinwiki_in_out.py
+++ b/src/moin/converters/_tests/test_moinwiki_in_out.py
@@ -4,9 +4,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moinwiki->DOM->moinwiki using moinwiki_in and moinwiki_out converters
+MoinMoin - Tests for MoinWiki -> DOM -> MoinWiki using moinwiki_in and moinwiki_out converters.
 
-It is merge of test_moinwiki_in and test_moinwiki_out, looks bad but works.
+This is a merge of test_moinwiki_in and test_moinwiki_out; it looks messy, but it works.
 
 TODO: Failing tests are commented out and need to be fixed.
 """
diff --git a/src/moin/converters/_tests/test_moinwiki_out.py b/src/moin/converters/_tests/test_moinwiki_out.py
index c79deb754..a55e0e115 100644
--- a/src/moin/converters/_tests/test_moinwiki_out.py
+++ b/src/moin/converters/_tests/test_moinwiki_out.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.converters.moinwiki_out
+MoinMoin - moin.converters.moinwiki_out tests.
 """
 
 import pytest
diff --git a/src/moin/converters/_tests/test_registry.py b/src/moin/converters/_tests/test_registry.py
index b7be17aee..02822f64f 100644
--- a/src/moin/converters/_tests/test_registry.py
+++ b/src/moin/converters/_tests/test_registry.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.converters.default_registry
+MoinMoin - moin.converters.default_registry tests.
 """
 
 import pytest
diff --git a/src/moin/converters/_tests/test_rst_in.py b/src/moin/converters/_tests/test_rst_in.py
index 82f28ba16..5e8913b5c 100644
--- a/src/moin/converters/_tests/test_rst_in.py
+++ b/src/moin/converters/_tests/test_rst_in.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.converters.rst_in
+MoinMoin - moin.converters.rst_in tests.
 """
 
 import pytest
diff --git a/src/moin/converters/_tests/test_rst_in_out.py b/src/moin/converters/_tests/test_rst_in_out.py
index d4000d9a9..462e9dc89 100644
--- a/src/moin/converters/_tests/test_rst_in_out.py
+++ b/src/moin/converters/_tests/test_rst_in_out.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for rst -> DOM -> rst using rst in and out converters
+MoinMoin - Tests for RST->DOM->RST using rst_in and rst_out converters.
 
 TODO: Failing tests are commented out and need to be fixed.
 """
diff --git a/src/moin/converters/_tests/test_rst_out.py b/src/moin/converters/_tests/test_rst_out.py
index b799da985..5d318fe0f 100644
--- a/src/moin/converters/_tests/test_rst_out.py
+++ b/src/moin/converters/_tests/test_rst_out.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.converters.rst_out
+MoinMoin - moin.converters.rst_out tests.
 """
 
 import pytest
diff --git a/src/moin/converters/_tests/test_smiley.py b/src/moin/converters/_tests/test_smiley.py
index 761e08ab8..a495d26b9 100644
--- a/src/moin/converters/_tests/test_smiley.py
+++ b/src/moin/converters/_tests/test_smiley.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.converters.smiley
+MoinMoin - moin.converters.smiley tests.
 """
 
 import pytest
@@ -27,32 +27,32 @@ def serialize_strip(elem, **options):
 @pytest.mark.parametrize(
     "input,query",
     [
-        # normal
+        # Normal
         (
             "<page><body><p>bla bla :-) bla bla</p></body></page>",
             '/page/body/p/span[@class="moin-text-icon moin-smile"]',
         ),
-        # in code
+        # In code
         ("<page><body><code>bla bla :-) bla bla</code></body></page>", '/page/body[code="bla bla :-) bla bla"]'),
-        # 2 at once
+        # Two at once
         (
             "<page><body><p>:-) :-(</p></body></page>",
             "/page/body/p"
             '[span[1][@class="moin-text-icon moin-smile"]]'
             '[span[2][@class="moin-text-icon moin-sad"]]',
         ),
-        # strong
+        # Strong
         (
             "<page><body><p><strong>:-)</strong></p></body></page>",
             '/page/body/p/strong/span[@class="moin-text-icon moin-smile"]',
         ),
-        # Test to check we do not have bug with newline in the string
+        # Test to ensure we do not have a bug with a newline in the string
         ("<page><body><p>1\n2\n3\n4</p></body></page>", '/page/body[p="1\n2\n3\n4"]'),
-        # Test with space between the elements
+        # Test with a space between elements
         ("<page><body><table-of-content />     <p>text</p></body></page>", '/page/body[p="text"]'),
         # Test the ignored tags
         ("<page><body><p><code>:-)</code></p></body></page>", '/page/body/p[code=":-)"]'),
-        # Test the ignored tags and subelement
+        # Test the ignored tags and subelements
         (
             "<page><body><blockcode>:-)<strong>:-(</strong></blockcode></body></page>",
             '/page/body/blockcode[text()=":-)"][strong=":-("]',
diff --git a/src/moin/converters/_util.py b/src/moin/converters/_util.py
index d66b334f5..ab664ae19 100644
--- a/src/moin/converters/_util.py
+++ b/src/moin/converters/_util.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - converter utilities
+MoinMoin - converter utilities.
 """
 
 try:
@@ -26,15 +26,15 @@ def allowed_uri_scheme(uri):
 
 def decode_data(data, contenttype=None):
     """
-    read and decode data, return unicode text
+    Read and decode data; return Unicode text.
 
-    supported types for data:
-    - rev object
+    Supported types for data:
+    - revision object
     - bytes
     - str
 
-    file-like objects and bytes need to be either utf-8 (or ascii, which is a subset of utf-8)
-    encoded or contenttype (including a charset parameter) needs to be given.
+    File-like objects and bytes need to be either UTF-8 (or ASCII, which is a subset of UTF-8)
+    encoded, or content type (including a charset parameter) needs to be given.
     """
     if not isinstance(data, (bytes, str)):
         data = data.data.read()
@@ -53,7 +53,7 @@ def decode_data(data, contenttype=None):
 
 def normalize_split_text(text):
     """
-    normalize line endings, split text into a list of lines
+    Normalize line endings and split text into a list of lines.
     """
     text = text.replace("\r\n", "\n")
     lines = text.split("\n")
@@ -62,13 +62,13 @@ def normalize_split_text(text):
 
 class _Iter:
     """
-    Iterator with push back support
+    Iterator with push-back support.
 
     Collected items can be pushed back into the iterator and further calls will
     return them.
 
     Increments a counter tracking the current line number. This is used by _Stack to
-    add an attribute used by javascript to autoscroll the edit textarea.
+    add an attribute used by JavaScript to auto-scroll the edit textarea.
     """
 
     def __init__(self, parent, startno=0):
diff --git a/src/moin/converters/_wiki_macro.py b/src/moin/converters/_wiki_macro.py
index 6132daac6..a02e1e562 100644
--- a/src/moin/converters/_wiki_macro.py
+++ b/src/moin/converters/_wiki_macro.py
@@ -29,7 +29,7 @@ def _BR_repl(self, args, text, context_block):
 
     def _FootNote_repl(self, args, text, context_block):
         if not args:
-            # return a minimal note elem to indicate explicit footnote placement
+            # Return a minimal note element to indicate explicit footnote placement
             elem = moin_page.note()
             return elem
 
@@ -51,9 +51,9 @@ def _Include_repl(self, args, text, context_block):
         The transclusion {{jpeg.jpg}} and the macro <<Include(jpeg.jpg)>> will have
         identical output.
 
-        If context_block is true, the macro expansion will be enclosed in a DIV-tag, else the
-        macro output will be enclosed in a SPAN-tag. converters/include.py will resolve
-        HTML 5 validation issues should the macro output block tags within an inline context.
+        If context_block is true, the macro expansion will be enclosed in a DIV tag; otherwise the
+        macro output will be enclosed in a SPAN tag. converters/include.py will resolve
+        HTML5 validation issues should the macro output block tags within an inline context.
         """
 
         def error_message(msg):
@@ -77,7 +77,9 @@ def error_message(msg):
             pass
         sort = "sort" in args and args["sort"]
         if sort and sort not in ("ascending", "descending"):
-            return error_message(_("Include Macro above has invalid format, expected sort=ascending or descending"))
+            return error_message(
+                _("Include Macro above has invalid format, expected sort=ascending or sort=descending")
+            )
         # TODO: We need corresponding code in include.py to process items, skipitems, titlesonly, and editlink
         items = "items" in args and int(args["items"])
         skipitems = "skipitems" in args and int(args["skipitems"])
@@ -163,7 +165,7 @@ def macro_text(self, text):
         """
         Should be overridden to format text in some macros according to the
         input type.
-        :returns: Sequence of (ET.Element, unicode)
+        :returns: Sequence of (ET.Element, Unicode)
         """
         return [text]
 
diff --git a/src/moin/converters/archive_in.py b/src/moin/converters/archive_in.py
index b11ad6ea9..5a56b64da 100644
--- a/src/moin/converters/archive_in.py
+++ b/src/moin/converters/archive_in.py
@@ -2,9 +2,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Archives converter (e.g. zip, tar)
+MoinMoin - Archives converter (e.g., zip, tar)
 
-Make a DOM Tree representation of an archive (== list contents of it in a table).
+Make a DOM tree representation of an archive (i.e., list its contents in a table).
 """
 
 
@@ -30,7 +30,7 @@
 
 class ArchiveException(Exception):
     """
-    exception class used in case of trouble with opening/listing an archive
+    Exception class used in case of trouble opening/listing an archive.
     """
 
 
@@ -76,13 +76,13 @@ def __call__(self, rev, contenttype=None, arguments=None):
 
     def list_contents(self, fileobj):
         """
-        analyze archive we get as fileobj and return data for table rendering.
+        Analyze the archive we get as fileobj and return data for table rendering.
 
-        We return a list of rows, each row is a list of cells.
+        Returns a list of rows; each row is a list of cells.
 
         Usually each row is [size, datetime, name] for each archive member.
 
-        In case of problems, it shall raise ArchiveException(error_msg).
+        In case of problems, raise ArchiveException(error_msg).
         """
         raise NotImplementedError
 
diff --git a/src/moin/converters/audio_video_in.py b/src/moin/converters/audio_video_in.py
index 31aeb0262..11d9aa2c3 100644
--- a/src/moin/converters/audio_video_in.py
+++ b/src/moin/converters/audio_video_in.py
@@ -2,9 +2,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Audio/Video converter
+MoinMoin - Audio/Video converter.
 
-Convert audio/video to <object> tag for the DOM Tree.
+Convert an audio/video file to an <object> tag for the DOM tree.
 """
 
 
@@ -17,7 +17,7 @@
 
 class Converter:
     """
-    Convert audio/video to the corresponding <object> in the DOM Tree
+    Convert an audio/video file to the corresponding <object> in the DOM tree.
     """
 
     @classmethod
diff --git a/src/moin/converters/creole_in.py b/src/moin/converters/creole_in.py
index b0c74d01e..8fcf3e3d6 100644
--- a/src/moin/converters/creole_in.py
+++ b/src/moin/converters/creole_in.py
@@ -4,9 +4,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Creole input converter
+MoinMoin - Creole input converter.
 
-See http://wikicreole.org/ for latest specs.
+See http://wikicreole.org/ for the latest specs.
 
 Notes:
 
@@ -14,10 +14,10 @@
   Creole 1.0 does not require us to support this.
 - No markup allowed in table headings.
   Creole 1.0 does not require us to support this.
-- No (non-bracketed) generic url recognition: this is "mission impossible"
+- No (non-bracketed) generic URL recognition: this is "mission impossible"
   except if you want to risk lots of false positives. Only known protocols
   are recognized.
-- We do not allow ":" before "//" italic markup to avoid urls with
+- We do not allow ":" before "//" italic markup to avoid URLs with
   unrecognized schemes (like wtf://server/path) triggering italic rendering
   for the rest of the paragraph.
 """
diff --git a/src/moin/converters/docbook_in.py b/src/moin/converters/docbook_in.py
index d86fb3a7c..310052a88 100644
--- a/src/moin/converters/docbook_in.py
+++ b/src/moin/converters/docbook_in.py
@@ -3,12 +3,12 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - DocBook input converter
-Converts a DocBook document into an internal document tree.
+MoinMoin - DocBook input converter.
+Convert a DocBook document into an internal document tree.
 
 Currently supports DocBook v5.
 
-Some elements of DocBook v4 specification are also supported
+Some elements of the DocBook v4 specification are also supported
 for backward compatibility:
 
 - ulink
@@ -52,10 +52,10 @@ def XML(text, parser=None):
 
 class XMLParser(ET.XMLParser):
     """
-    Override EmeraldTree/tree.py XMLParser class. Required to add auto-scroll textarea feature.
+    Override EmeraldTree/tree.py XMLParser class. Required to add an auto-scroll textarea feature.
 
     There is no need to subclass all tree.py classes and procedures with stubs because this
-    modified _start_list is only needed for the initial construction of the DOM when
+    modified _start_list is only needed during the initial construction of the DOM when
     flaskg.add_lineno_attr may be True.
     """
 
@@ -68,14 +68,14 @@ def _start_list(self, tag, attrib_in):
 
 class Converter:
     """
-    Converter application/docbook+xml -> x.moin.document
+    Convert application/docbook+xml -> x.moin.document.
     """
 
     # Namespace of our input data
     docbook_namespace = {docbook.namespace: "docbook"}
 
-    # DocBook elements which are completely ignored by our converter
-    # We even do not process children of these elements
+    # DocBook elements that are completely ignored by our converter
+    # We do not even process children of these elements
     ignored_tags = {
         # Info elements
         "abstract",
diff --git a/src/moin/converters/docbook_out.py b/src/moin/converters/docbook_out.py
index b88d5c816..34271ab22 100644
--- a/src/moin/converters/docbook_out.py
+++ b/src/moin/converters/docbook_out.py
@@ -3,9 +3,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - DocBook output converter
+MoinMoin - DocBook output converter.
 
-Converts an internal document tree into a DocBook v5 document.
+Convert an internal document tree into a DocBook v5 document.
 """
 
 from emeraldtree import ElementTree as ET
@@ -33,7 +33,7 @@ class Converter:
     # Only these admonitions are supported by DocBook 5
     admonition_tags = {"caution", "important", "note", "tip", "warning"}
 
-    # DOM Tree element which can easily be converted into a DocBook
+    # DOM tree elements that can be easily converted into a DocBook
     # element, without attributes.
     simple_tags = {
         "code": docbook.literal,
@@ -101,10 +101,10 @@ def new(self, tag, attrib, children):
 
     def new_copy(self, tag, element, attrib):
         """
-        Function to copy one element to the DocBook tree
+        Copy one element to the DocBook tree.
 
         It first converts the children of the element,
-        and then the element itself
+        and then the element itself.
         """
         children = self.do_children(element)
         return self.new(tag, attrib, children)
diff --git a/src/moin/converters/everything.py b/src/moin/converters/everything.py
index e560d16c2..f1dce4b96 100644
--- a/src/moin/converters/everything.py
+++ b/src/moin/converters/everything.py
@@ -2,9 +2,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - converter for all items (fallback)
+MoinMoin - Converter for all items (fallback).
 
-Convert any item to a DOM Tree (we just create a link to download it).
+Convert any item to a DOM tree (we just create a link to download it).
 """
 
 from moin.constants.keys import NAME
@@ -18,7 +18,7 @@
 
 class Converter:
     """
-    Convert a unsupported item to DOM Tree.
+    Convert an unsupported item to a DOM tree.
     """
 
     @classmethod
diff --git a/src/moin/converters/highlight.py b/src/moin/converters/highlight.py
index a001ce8ab..aeb39810b 100644
--- a/src/moin/converters/highlight.py
+++ b/src/moin/converters/highlight.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Text highlighting converter
+MoinMoin - Text highlighting converter.
 """
 
 import re
@@ -30,7 +30,7 @@ def recurse(self, elem):
             if isinstance(child, (bytes, str)):
                 pos = 0
 
-                # Restrict it to our own namespace for now
+                # Restrict it to our own namespace for now.
                 if elem.tag.uri == moin_page.namespace:
                     for match in re.finditer(self.pattern, child):
                         text = child[pos : match.start()]
@@ -53,7 +53,7 @@ def recurse(self, elem):
             elem[:] = new_childs
 
     def __init__(self, regex):
-        """treat each word separately and ignore case sensitivity"""
+        """Treat each word separately and ignore case sensitivity."""
         self.pattern = re.compile(regex.replace(" ", "|"), re.IGNORECASE)
 
     def __call__(self, tree):
diff --git a/src/moin/converters/html_in.py b/src/moin/converters/html_in.py
index 3c35f41ff..9361d535b 100644
--- a/src/moin/converters/html_in.py
+++ b/src/moin/converters/html_in.py
@@ -2,11 +2,11 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - HTML input converter
+MoinMoin - HTML input converter.
 
-Converts an XHTML document into an internal document tree.
+Convert an XHTML document into an internal document tree.
 
-TODO : Add support for style
+TODO: add support for style.
 """
 
 import re
@@ -50,7 +50,7 @@ def log(self, message, category):
 
 class Converter:
     """
-    Converter html -> .x.moin.document
+    Convert HTML -> .x.moin.document.
     """
 
     # Namespace of our input data
@@ -59,10 +59,10 @@ class Converter:
     # HTML tags which can be converted directly to the moin_page namespace
     symmetric_tags = {"div", "p", "strong", "code", "quote", "blockquote", "span"}
 
-    # HTML tags to define a list, except dl which is a little bit different
+    # HTML tags that define a list; except dl, which is a little bit different
     list_tags = {"ul", "dir", "ol"}
 
-    # HTML tags which can be convert without attributes in a different DOM tag
+    # HTML tags that can be converted without attributes into a different DOM tag
     simple_tags = {  # Emphasis
         "em": moin_page.emphasis,
         "i": moin_page.emphasis,
@@ -76,15 +76,15 @@ class Converter:
         # Lists
         "dt": moin_page.list_item_label,
         "dd": moin_page.list_item_body,
-        # TODO : Some tags related to tables can be also simplify
+        # TODO: Some tags related to tables can also be simplified
     }
 
-    # HTML Tag which does not have equivalence in the DOM Tree
-    # But we keep the information using <span element>
+    # HTML tags that do not have equivalents in the DOM tree
+    # But we keep the information using a <span> element
     inline_tags = {"abbr", "acronym", "address", "dfn", "kbd"}
 
-    # HTML tags which are completely ignored by our converter.
-    # We even do not process children of these elements.
+    # HTML tags that are completely ignored by our converter.
+    # We do not even process children of these elements.
     ignored_tags = {
         "applet",
         "area",
diff --git a/src/moin/converters/html_out.py b/src/moin/converters/html_out.py
index 296fae583..15a5968bd 100644
--- a/src/moin/converters/html_out.py
+++ b/src/moin/converters/html_out.py
@@ -3,9 +3,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - HTML output converter
+MoinMoin - HTML output converter.
 
-Converts an internal document tree into a HTML tree.
+Convert an internal document tree into an HTML tree.
 """
 
 import re
@@ -38,7 +38,7 @@
 
 def style_attr_filter(style):
     """
-    If allow_style_attributes option is True check style attribute for suspect strings, else return ''.
+    If allow_style_attributes is True, check the style attribute for suspect strings; otherwise return ''.
     """
     if app.cfg.allow_style_attributes:
         s = "".join(style.strip().lower().split())
@@ -62,7 +62,7 @@ def mark_item_as_transclusion(elem, href_or_item):
     Return elem after adding a "moin-transclusion" class and a "data-href" attribute with
     a link to the transcluded item.
 
-    On the client side, a Javascript function will wrap the element (or a parent element)
+    On the client side, a JavaScript function will wrap the element (or a parent element)
     in a span or div and 2 overlay siblings will be created.
     """
     if isinstance(href_or_item, Item):
@@ -105,7 +105,7 @@ class Attributes:
     visit_style = Attribute("style")
     visit_title = Attribute("title")
     visit_id = Attribute("id")
-    visit_type = Attribute("type")  # IE8 needs <object... type="image/svg+xml" ...> to display svg images
+    visit_type = Attribute("type")  # IE8 needs <object... type="image/svg+xml" ...> to display SVG images
 
     def __init__(self, element):
         self.element = element
diff --git a/src/moin/converters/image_in.py b/src/moin/converters/image_in.py
index d8d1a8525..34b56514a 100644
--- a/src/moin/converters/image_in.py
+++ b/src/moin/converters/image_in.py
@@ -3,9 +3,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Image converter
+MoinMoin - Image converter.
 
-Convert image to <object> tag for the DOM Tree.
+Convert an image to an <object> tag for the DOM tree.
 """
 
 from urllib.parse import urlencode, parse_qs
@@ -21,7 +21,7 @@
 
 class Converter:
     """
-    Convert an image to the corresponding <object> in the DOM Tree
+    Convert an image to the corresponding <object> in the DOM tree.
     """
 
     @classmethod
@@ -38,7 +38,7 @@ def __call__(self, rev, contenttype=None, arguments=None):
         if arguments:
             query = arguments.keyword.get(xinclude.href)
             if query and query.query:
-                # query.query value is similar to  "w=75" given a transclusion "{{jpeg||&w=75 class="top"}}"
+                # The value of query.query is similar to "w=75" when given the transclusion '{{jpeg||&w=75 class="top"}}'.
                 query_keys.update(parse_qs(query.query))
             attrib = arguments.keyword
 
diff --git a/src/moin/converters/include.py b/src/moin/converters/include.py
index b9312f413..67633fe50 100644
--- a/src/moin/converters/include.py
+++ b/src/moin/converters/include.py
@@ -3,10 +3,10 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Include handling
+MoinMoin - Include handling.
 
 Expands the Include macro and transclusion elements in an internal Moin document. Note
-these two forms produce similar results:
+that these two forms produce similar results:
 
     {{jpeg.jpg}}
     <<Include(jpeg.jpg)>>
@@ -54,14 +54,14 @@
 inline element embedded within a paragraph. Here html_out.py will wrap the transclusion in
 a Span rather than a Div or convert a P-tag containing a phrase into a Span::
 
-    "My pet {{bird.jpg}} flys.", "[[SomePage|{{Logo.png}}]]" or "Yes, we have {{no}} bananas."
+    "My pet {{bird.jpg}} flies.", "[[SomePage|{{Logo.png}}]]" or "Yes, we have {{no}} bananas."
 
 In complex cases where a block level item is transcluded within the midst of
 several levels of text markup, such as::
 
    "plain ''italic '''bold {{BlockItem}} bold''' italic'' plain"
 
-then we must avoid generating invalid html like::
+then we must avoid generating invalid HTML like::
 
     <p>plain <emphasis>italic <strong>bold <div>
     ...</div> bold</strong> italic</emphasis> plain</p>
diff --git a/src/moin/converters/link.py b/src/moin/converters/link.py
index 09fbd61b1..83f054004 100644
--- a/src/moin/converters/link.py
+++ b/src/moin/converters/link.py
@@ -47,7 +47,7 @@ def handle_external_links(self, elem: Element, link: Iri, to_tag=_tag_xlink_href
 
     def __call__(self, *args, **kw):
         """
-        Calls the self.traverse_tree method
+        Call the self.traverse_tree method.
         """
         # avoids recursion for this method
         # because it is also called in subclasses
@@ -63,7 +63,7 @@ def traverse_tree(
         __tag_data_href=_tag_html_data_href,
     ):
         """
-        Traverses the tree and handles each element appropriately
+        Traverse the tree and handle each element appropriately.
         """
         new_page_href = elem.get(__tag_page_href)
         if new_page_href:
@@ -100,7 +100,7 @@ def traverse_tree(
 
     def absolute_path(self, path: IriPath, current_page_path: IriPath) -> IriPath:
         """
-        Converts a relative iri path into an absolute one
+        Convert a relative IRI path into an absolute one.
 
         :param path: the relative path to be converted
         :type path: Iri.path
diff --git a/src/moin/converters/macro.py b/src/moin/converters/macro.py
index 747fa33bd..4dbc23155 100644
--- a/src/moin/converters/macro.py
+++ b/src/moin/converters/macro.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Macro handling
+MoinMoin - Macro handling.
 
 Expands all macro elements in an internal Moin document.
 """
@@ -60,8 +60,8 @@ def handle_macro(self, elem, page):
             elem_error.append(f"<<{name}>> {_('Error: invalid macro name.')}")
 
         except Exception as e:
-            # we do not want that a faulty macro aborts rendering of the page
-            # and makes the wiki UI unusable (by emitting a Server Error),
+            # We do not want a faulty macro to abort rendering of the page
+            # and make the wiki UI unusable (by emitting a Server Error),
             # thus, in case of exceptions, we just log the problem and return
             # some standard text.
             logging.exception(f"Macro {name} raised an exception:")
diff --git a/src/moin/converters/markdown_in.py b/src/moin/converters/markdown_in.py
index b2f6753f1..e2ab9f394 100644
--- a/src/moin/converters/markdown_in.py
+++ b/src/moin/converters/markdown_in.py
@@ -4,7 +4,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Markdown input converter
+MoinMoin - Markdown input converter.
 
 https://daringfireball.net/projects/markdown/
 """
@@ -94,10 +94,10 @@ class Converter:
     # HTML tags which can be converted directly to the moin_page namespace
     symmetric_tags = {"div", "p", "strong", "code", "quote", "blockquote"}
 
-    # HTML tags to define a list, except dl which is a little bit different
+    # HTML tags that define a list; except dl, which is a little bit different
     list_tags = {"ul", "ol"}
 
-    # HTML tags which can be convert without attributes in a different DOM tag
+    # HTML tags that can be converted without attributes into a different DOM tag
     simple_tags = {  # Emphasis
         "em": moin_page.emphasis,
         "i": moin_page.emphasis,
diff --git a/src/moin/converters/markdown_out.py b/src/moin/converters/markdown_out.py
index bd08e26a6..f73e16644 100644
--- a/src/moin/converters/markdown_out.py
+++ b/src/moin/converters/markdown_out.py
@@ -4,9 +4,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Markdown markup output converter
+MoinMoin - Markdown output converter.
 
-Converts an internal document tree into markdown markup.
+Convert an internal document tree into Markdown markup.
 """
 
 import urllib.request
@@ -26,8 +26,8 @@
 
 class Markdown:
     """
-    Markdown syntax elements
-    It's dummy
+    Markdown syntax elements.
+    Placeholder for Markdown-specific tokens.
     """
 
     h = "#"
@@ -80,7 +80,7 @@ def __init__(self):
 
 class Converter:
     """
-    Converter application/x.moin.document -> text/x.moin.wiki
+    Convert application/x.moin.document to Markdown markup.
     """
 
     namespaces = {moin_page.namespace: "moinpage", xinclude: "xinclude"}
diff --git a/src/moin/converters/mediawiki_in.py b/src/moin/converters/mediawiki_in.py
index 09b75bc34..75f7d7737 100644
--- a/src/moin/converters/mediawiki_in.py
+++ b/src/moin/converters/mediawiki_in.py
@@ -6,7 +6,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Media Wiki input converter
+MoinMoin - MediaWiki input converter.
 """
 
 import re
diff --git a/src/moin/converters/moinwiki19_in.py b/src/moin/converters/moinwiki19_in.py
index 292ba787e..e4c08cff7 100644
--- a/src/moin/converters/moinwiki19_in.py
+++ b/src/moin/converters/moinwiki19_in.py
@@ -5,7 +5,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Moin Wiki 1.9 input converter
+MoinMoin - MoinWiki 1.9 input converter.
 """
 
 import re
diff --git a/src/moin/converters/moinwiki_in.py b/src/moin/converters/moinwiki_in.py
index b21f43b07..176866220 100644
--- a/src/moin/converters/moinwiki_in.py
+++ b/src/moin/converters/moinwiki_in.py
@@ -6,7 +6,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Moin Wiki input converter
+MoinMoin - MoinWiki input converter.
 """
 
 import re
diff --git a/src/moin/converters/moinwiki_out.py b/src/moin/converters/moinwiki_out.py
index 86d32e5d6..444919e49 100644
--- a/src/moin/converters/moinwiki_out.py
+++ b/src/moin/converters/moinwiki_out.py
@@ -4,9 +4,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Moinwiki markup output converter
+MoinMoin - MoinWiki output converter.
 
-Converts an internal document tree into moinwiki markup.
+Convert an internal document tree into MoinWiki markup.
 """
 
 import urllib.request
@@ -32,8 +32,8 @@
 
 class Moinwiki:
     """
-    Moinwiki syntax elements
-    It's dummy
+    MoinWiki syntax elements.
+    Placeholder for MoinWiki-specific tokens.
     """
 
     h = "="
@@ -80,7 +80,7 @@ def __init__(self):
 
 class Converter:
     """
-    Converter application/x.moin.document -> text/x.moin.wiki
+    Convert application/x.moin.document to text/x.moin.wiki.
     """
 
     namespaces = {moin_page.namespace: "moinpage", xinclude: "xinclude"}
diff --git a/src/moin/converters/nonexistent_in.py b/src/moin/converters/nonexistent_in.py
index 145ba55ea..b4fc7c842 100644
--- a/src/moin/converters/nonexistent_in.py
+++ b/src/moin/converters/nonexistent_in.py
@@ -2,9 +2,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - converter for non-existing items
+MoinMoin - converter for nonexistent items.
 
-Convert a non-existent item to the DOM Tree.
+Convert a nonexistent item to a DOM tree.
 """
 
 
@@ -19,7 +19,7 @@
 
 class Converter:
     """
-    Convert a non-existing item to DOM Tree.
+    Convert a nonexistent item to a DOM tree.
     """
 
     @classmethod
@@ -30,7 +30,7 @@ def __call__(self, rev, contenttype=None, arguments=None):
         item_name = rev.item.fqname.fullname
         attrib = {xlink.href: Iri(scheme="wiki", authority="", path="/" + item_name, query="do=modify")}
         a = moin_page.a(
-            attrib=attrib, children=[_("{item_name} does not exist. Create it? ").format(item_name=item_name)]
+            attrib=attrib, children=[_("{item_name} does not exist. Create it?").format(item_name=item_name)]
         )
         body = moin_page.body(children=(a,))
         return moin_page.page(children=(body,))
diff --git a/src/moin/converters/nowiki.py b/src/moin/converters/nowiki.py
index 3bcf0bda4..f98da4de7 100644
--- a/src/moin/converters/nowiki.py
+++ b/src/moin/converters/nowiki.py
@@ -67,12 +67,12 @@ def handle_nowiki(self, elem, page):
 
         lexer = None
         if nowiki_name in {"diff", "cplusplus", "python", "java", "pascal", "irc"}:
-            # make old style markup similar to {{{#!python like new style {{{#!highlight python
+            # Make old-style markup similar to {{{#!python}} like the new style {{{#!highlight python}}.
             optional_args = nowiki_name if not optional_args else nowiki_name + " " + optional_args
             nowiki_name = "highlight"
 
         if nowiki_name == "highlight":
-            # TODO: support moin 1.9 options like numbers=on start=222 step=10
+            # TODO: support Moin 1.9 options like numbers=on, start=222, step=10
             optional_args = optional_args.split()[0]  # ignore all parameters except lexer name
             try:
                 lexer = pygments.lexers.get_lexer_by_name(optional_args)
@@ -96,7 +96,7 @@ def handle_nowiki(self, elem, page):
                 if m and m.group(1):
                     delim = m.group(1)
                 if not delim:
-                    delim = optional_args.split()[0]  # ignore all parameters except a delimiter in first position
+                    delim = optional_args.split()[0]  # ignore all parameters except a delimiter in the first position
                     if len(delim) > 1:
                         delim = None
             sep = delim or ";"
diff --git a/src/moin/converters/opendocument_in.py b/src/moin/converters/opendocument_in.py
index 604c6198f..daa4c7308 100644
--- a/src/moin/converters/opendocument_in.py
+++ b/src/moin/converters/opendocument_in.py
@@ -3,9 +3,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - OpenDocument Format (ODF) input converter
+MoinMoin - OpenDocument Format (ODF) input converter.
 
-ODF documents can be created with OpenOffice.org, Libre Office and other software.
+ODF documents can be created with OpenOffice.org, LibreOffice, and other software.
 """
 
 import zipfile
@@ -59,7 +59,7 @@ def __call__(self, rev, contenttype=None, arguments=None):
     default_registry.register(OpenDocumentIndexingConverter._factory, Type(t), type_text_plain)
 
 
-# use same converter for the old *.sx? (pre-opendocument) openoffice documents:
+# Use the same converter for the old *.sx? (pre-OpenDocument) OpenOffice documents:
 OpenOfficeIndexingConverter = OpenDocumentIndexingConverter
 
 openoffice_types = """\
diff --git a/src/moin/converters/pdf_in.py b/src/moin/converters/pdf_in.py
index 30601d569..0c457517a 100644
--- a/src/moin/converters/pdf_in.py
+++ b/src/moin/converters/pdf_in.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - PDF input converter
+MoinMoin - PDF input converter.
 """
 
 import io
@@ -23,7 +23,7 @@
 logging = log.getLogger(__name__)
 
 
-# pdfminer creates many unwanted info messages
+# PDFMiner creates many unwanted info messages
 stdlogging.getLogger("pdfminer").setLevel(logging.WARNING)
 
 
diff --git a/src/moin/converters/pygments_in.py b/src/moin/converters/pygments_in.py
index 6f9f9df82..1bda436cc 100644
--- a/src/moin/converters/pygments_in.py
+++ b/src/moin/converters/pygments_in.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Pygments driven syntax highlighting input converter
+MoinMoin - Pygments-driven syntax highlighting input converter.
 """
 
 try:
diff --git a/src/moin/converters/rst_in.py b/src/moin/converters/rst_in.py
index 64aec9e00..c3271fab6 100644
--- a/src/moin/converters/rst_in.py
+++ b/src/moin/converters/rst_in.py
@@ -6,13 +6,13 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - ReStructured Text input converter
+MoinMoin - reStructuredText input converter.
 
-It's based on docutils rst parser.
-Conversion of docutils document tree to moinmoin document tree.
+It's based on the Docutils reST parser.
+Conversion of the Docutils document tree to the MoinMoin document tree.
 
-This converter based on ReStructuredText 2006-09-22.
-Works with docutils version 0.5 (2008-06-25) or higher.
+This converter is based on ReStructuredText (2006-09-22).
+Works with Docutils version 0.5 (2008-06-25) or higher.
 """
 
 import re
diff --git a/src/moin/converters/rst_out.py b/src/moin/converters/rst_out.py
index c2c81e0cc..760e072eb 100644
--- a/src/moin/converters/rst_out.py
+++ b/src/moin/converters/rst_out.py
@@ -5,9 +5,9 @@
 """
 MoinMoin - reStructuredText markup output converter
 
-Converts an internal document tree into reStructuredText markup.
+Convert an internal document tree into reStructuredText markup.
 
-This converter based on ReStructuredText 2006-09-22.
+This converter is based on ReStructuredText (2006-09-22).
 """
 
 import re
@@ -45,7 +45,7 @@ def width(self):
 class Table:
     """
     An object of this class collects the structure of a table
-    and represent it in ReStructuredText syntax.
+    and represents it in reStructuredText syntax.
     """
 
     def __init__(self):
@@ -72,9 +72,9 @@ def add_row(self):
 
     def end_row(self):
         """
-        Adds empty cells to current row if it's too short.
+        Add empty cells to the current row if it is too short.
 
-        Moves the row to the head of the table if it is table header.
+        Move the row to the head of the table if it is a table header.
         """
         if len(self.table) > 1:
             if len(self.table[-2]) > len(self.table[-1]):
@@ -108,7 +108,7 @@ def height(self):
 
     def width(self):
         """
-        :returns: width of rows in the table or zero if rows have different width
+        :returns: width of rows in the table, or zero if rows have different widths
         """
         if not self.table:
             return 0
diff --git a/src/moin/converters/smiley.py b/src/moin/converters/smiley.py
index 950a2a30a..e67039db5 100644
--- a/src/moin/converters/smiley.py
+++ b/src/moin/converters/smiley.py
@@ -3,10 +3,10 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Smiley converter
+MoinMoin - Smiley converter.
 
-Replace all the text corresponding to a smiley, by the corresponding
-element for the DOM Tree.
+Replace all text corresponding to a smiley with the corresponding
+ element for the DOM tree.
 """
 
 import re
@@ -21,7 +21,7 @@
 
 class Converter:
     """
-    Replace each smiley by the corresponding element in the DOM Tree
+    Replace each smiley with the corresponding element in the DOM tree.
     """
 
     smileys = {
@@ -115,7 +115,7 @@ def do_smiley(self, element):
         by the appropriate elements, and the former text for the
         other elements of the list.
         """
-        # We split our string into different items arround
+        # We split our string into different items around
         # the matched smiley.
         splitted_string = re.split(self.smiley_re, element)
         # And then for each item of the list,
diff --git a/src/moin/converters/text_csv_in.py b/src/moin/converters/text_csv_in.py
index b627b4a02..2f3ea9446 100644
--- a/src/moin/converters/text_csv_in.py
+++ b/src/moin/converters/text_csv_in.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - CSV text data to DOM converter
+MoinMoin - CSV text data to DOM converter.
 """
 
 import csv
@@ -28,7 +28,7 @@ def _factory(cls, type_input, type_output, **kw):
 
     def __call__(self, data, contenttype=None, arguments=None):
         text = decode_data(data, contenttype)
-        # prevent incorrect output when there are multiple trailing blank lines
+        # Prevent incorrect output when there are multiple trailing blank lines
         text = text.rstrip()
         content = normalize_split_text(text)
         dialect = csv.Sniffer().sniff(text)
@@ -37,7 +37,7 @@ def __call__(self, data, contenttype=None, arguments=None):
         head = None
         cls = None
         try:
-            # fragile function, throws errors when csv file is incorrectly formatted
+            # Fragile function; throws errors when the CSV file is incorrectly formatted
             if csv.Sniffer().has_header("\n".join(content)):
                 head = rows[0]
                 rows = rows[1:]
diff --git a/src/moin/converters/text_in.py b/src/moin/converters/text_in.py
index 13bfb6315..55ede1c53 100644
--- a/src/moin/converters/text_in.py
+++ b/src/moin/converters/text_in.py
@@ -7,9 +7,9 @@
 
 It just puts all text into a code block. It acts as a wildcard for text/* input.
 
-We keep it at MIDDLE+2 prio in the registry, one after pygments converter, so
-it is a fallback for the case we have no pygments or pygments has no support
-for the input mimetype.
+We keep it at MIDDLE+2 priority in the registry, one after the pygments converter, so
+it is a fallback for the case where we have no pygments or pygments has no support
+for the input MIME type.
 """
 
 from moin.utils.mime import Type, type_moin_document
diff --git a/src/moin/converters/text_out.py b/src/moin/converters/text_out.py
index 58279a337..953b7acfd 100644
--- a/src/moin/converters/text_out.py
+++ b/src/moin/converters/text_out.py
@@ -2,13 +2,13 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - plain text output converter
+MoinMoin - Plain text output converter.
 
-Converts an internal document tree into plain, unformatted text.
+Convert an internal document tree into plain, unformatted text.
 
 The purpose of this converter is mainly to be used in a converter chain like
-markup -> dom -> text and get rid of the (wiki, rst, docbook, ...) markup that
-way, so we get indexable plain text for our search index.
+markup -> DOM -> text to get rid of the (wiki, reStructuredText, DocBook, ...) markup;
+thus we get indexable plain text for our search index.
 """
 
 from . import default_registry
diff --git a/src/moin/converters/xml_in.py b/src/moin/converters/xml_in.py
index ce95ad1f3..8d0720832 100644
--- a/src/moin/converters/xml_in.py
+++ b/src/moin/converters/xml_in.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Generic XML input converter
+MoinMoin - Generic XML input converter.
 """
 
 import re
diff --git a/src/moin/datastructures/__init__.py b/src/moin/datastructures/__init__.py
index a9a95ff24..4dab0ebe9 100644
--- a/src/moin/datastructures/__init__.py
+++ b/src/moin/datastructures/__init__.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - datastructures (groups and dicts) support.
+MoinMoin - data structures (groups and dicts) support.
 """
 
 
diff --git a/src/moin/datastructures/backends/__init__.py b/src/moin/datastructures/backends/__init__.py
index 7aef1781a..8337fe91e 100644
--- a/src/moin/datastructures/backends/__init__.py
+++ b/src/moin/datastructures/backends/__init__.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - base classes for datastructs.
+MoinMoin - base classes for data structures.
 """
 
 from collections import UserDict
@@ -25,8 +25,8 @@ class DictDoesNotExistError(Exception):
 
 class BaseGroup:
     """
-    Group is something which stores members. Groups are immutable. A
-    member is some arbitrary entity name (Unicode object).
+    A group stores members. Groups are immutable. A
+    member is an arbitrary entity name (Unicode string).
     """
 
     def __init__(self, name, backend):
@@ -48,7 +48,7 @@ def __iter__(self, yielded_members=None, processed_groups=None):
 
 class BaseGroupsBackend:
     """
-    Backend provides access to the group definitions for the other
+    The backend provides access to the group definitions for the other
     MoinMoin code.
     """
 
@@ -66,15 +66,15 @@ def __contains__(self, group_name):
 
     def __iter__(self):
         """
-        Iterate over moin group names of the groups defined in this backend.
+        Iterate over Moin group names of the groups defined in this backend.
 
-        :returns: moin group names
+        :returns: Moin group names
         """
         raise NotImplementedError()
 
     def __getitem__(self, group_name):
         """
-        Get a group by its moin group name.
+        Get a group by its Moin group name.
         """
         raise NotImplementedError()
 
@@ -86,10 +86,10 @@ def _retrieve_members(self, group_name):
 
     def groups_with_member(self, member):
         """
-        List all group names of groups containing <member>.
+        Yield all group names of groups containing <member>.
 
         :param member: member name [unicode]
-        :returns: list of group names [unicode]
+        :returns: iterator of group names [unicode]
         """
         for group_name in self:
             try:
@@ -115,7 +115,7 @@ class LazyGroup(BaseGroup):
     A lazy group does not store members internally, but gets them from
     a backend when needed.
 
-    Lazy group is made only of members. It can not consist of other groups.
+    Lazy group is made only of members. It cannot consist of other groups.
 
     For instance, this is a possible LazyGroup:
 
@@ -123,7 +123,7 @@ class LazyGroup(BaseGroup):
       * OneMember
       * OtherMember
 
-    This is a group which cannot be LazyGroup:
+    This is a group that cannot be a LazyGroup:
 
      NotPossibleGroup
       * OneMember
@@ -177,7 +177,7 @@ def __init__(self, name, backend):
 
     def _load_group(self):
         """
-        Retrieve group data from the backend and filter it to members and group_members.
+        Retrieve group data from the backend and filter it to members and group members.
         """
         members_retrieved = set(self._backend._retrieve_members(self.name))
 
@@ -191,7 +191,7 @@ def __contains__(self, member, processed_groups=None):
         First check if <member> is part of this group and then check
         for every subgroup in this group.
 
-        <processed_groups> is needed to avoid infinite recursion, if
+        <processed_groups> is needed to avoid infinite recursion if
         groups are defined recursively.
 
         :param member: member name [unicode]
@@ -262,7 +262,7 @@ class BaseDict(UserDict):
 
     def __init__(self, name, backend):
         """
-        Initialize a dict. Dicts are greedy, it stores all keys and
+        Initialize a dict. Dicts are greedy; they store all keys and
         items internally.
 
         :param name: moin dict name
diff --git a/src/moin/datastructures/backends/_tests/__init__.py b/src/moin/datastructures/backends/_tests/__init__.py
index a390124d7..a5c2a01b3 100644
--- a/src/moin/datastructures/backends/_tests/__init__.py
+++ b/src/moin/datastructures/backends/_tests/__init__.py
@@ -5,7 +5,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.datastructures.backends base test classes.
+MoinMoin - moin.datastructures.backends base test classes.
 """
 
 
@@ -89,8 +89,8 @@ def test_groups_with_member(self):
 
     def test_backend_acl_allow(self):
         """
-        Test if the wiki group backend works with acl code.
-        Check user which has rights.
+        Test if the wiki group backend works with ACL code.
+        Check users who have rights.
         """
         acl_rights = ["AdminGroup:admin,read,write"]
         acl = AccessControlList(acl_rights, valid=app.cfg.acl_rights_contents)
@@ -103,8 +103,8 @@ def test_backend_acl_allow(self):
 
     def test_backend_acl_deny(self):
         """
-        Test if the wiki group backend works with acl code.
-        Check user which does not have rights.
+        Test if the wiki group backend works with ACL code.
+        Check a user who does not have rights.
         """
         acl_rights = ["AdminGroup:read,write"]
         acl = AccessControlList(acl_rights, valid=app.cfg.acl_rights_contents)
diff --git a/src/moin/datastructures/backends/_tests/test_composite_dicts.py b/src/moin/datastructures/backends/_tests/test_composite_dicts.py
index c4f63d386..cc8b19e8d 100644
--- a/src/moin/datastructures/backends/_tests/test_composite_dicts.py
+++ b/src/moin/datastructures/backends/_tests/test_composite_dicts.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-moin.datastructures.backends.composite_dicts test
+MoinMoin - moin.datastructures.backends.composite_dicts tests.
 """
 
 
diff --git a/src/moin/datastructures/backends/_tests/test_composite_groups.py b/src/moin/datastructures/backends/_tests/test_composite_groups.py
index 005109556..cb90bbbdc 100644
--- a/src/moin/datastructures/backends/_tests/test_composite_groups.py
+++ b/src/moin/datastructures/backends/_tests/test_composite_groups.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-moin.datastructures.backends.composite_groups test
+MoinMoin - moin.datastructures.backends.composite_groups tests.
 """
 
 
diff --git a/src/moin/datastructures/backends/_tests/test_config_dicts.py b/src/moin/datastructures/backends/_tests/test_config_dicts.py
index 524415293..1109d3f67 100644
--- a/src/moin/datastructures/backends/_tests/test_config_dicts.py
+++ b/src/moin/datastructures/backends/_tests/test_config_dicts.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.backends.config_dicts tests
+MoinMoin - moin.datastructures.backends.config_dicts tests.
 """
 
 
diff --git a/src/moin/datastructures/backends/_tests/test_config_groups.py b/src/moin/datastructures/backends/_tests/test_config_groups.py
index 160ee0014..f1a4fe8fd 100644
--- a/src/moin/datastructures/backends/_tests/test_config_groups.py
+++ b/src/moin/datastructures/backends/_tests/test_config_groups.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.backends.config_groups tests
+MoinMoin - moin.datastructures.backends.config_groups tests.
 """
 
 
diff --git a/src/moin/datastructures/backends/_tests/test_lazy_config_groups.py b/src/moin/datastructures/backends/_tests/test_lazy_config_groups.py
index fb575a3f0..83bc78ec4 100644
--- a/src/moin/datastructures/backends/_tests/test_lazy_config_groups.py
+++ b/src/moin/datastructures/backends/_tests/test_lazy_config_groups.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.backends.config_lazy_groups tests
+MoinMoin - moin.datastructures.backends.config_lazy_groups tests.
 """
 
 
@@ -37,7 +37,7 @@ def groups(self):
 
     def test_contains_group(self):
         """
-        ConfigLazyGroups can not contain other group members.
+        ConfigLazyGroups cannot contain other group members.
 
         This test does not make sense.
         """
diff --git a/src/moin/datastructures/backends/_tests/test_wiki_dicts.py b/src/moin/datastructures/backends/_tests/test_wiki_dicts.py
index 265b083f1..d4732a612 100644
--- a/src/moin/datastructures/backends/_tests/test_wiki_dicts.py
+++ b/src/moin/datastructures/backends/_tests/test_wiki_dicts.py
@@ -5,7 +5,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.datastructures.backends.wiki_dicts tests
+MoinMoin - moin.datastructures.backends.wiki_dicts tests.
 """
 
 
diff --git a/src/moin/datastructures/backends/_tests/test_wiki_groups.py b/src/moin/datastructures/backends/_tests/test_wiki_groups.py
index 907ad4d4c..9ac571126 100644
--- a/src/moin/datastructures/backends/_tests/test_wiki_groups.py
+++ b/src/moin/datastructures/backends/_tests/test_wiki_groups.py
@@ -6,7 +6,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - moin.backends.wiki_group tests
+MoinMoin - moin.datastructures.backends.wiki_groups tests.
 """
 
 
@@ -87,9 +87,8 @@ def test_member_removed_from_group_item(self):
 
     def test_wiki_backend_item_acl_usergroupmember_item(self):
         """
-        Test if the wiki group backend works with acl code.
-        First check acl rights of a user that is not a member of group
-        then add user member to an item group and check acl rights
+        Test if the wiki group backend works with ACL code.
+        First, check ACL rights of a user who is not a group member; then add the user to a group item and check ACL rights.
         """
         become_trusted()
         update_item("NewGroup", {USERGROUP: ["ExampleUser"]}, DATA)
diff --git a/src/moin/datastructures/backends/composite_dicts.py b/src/moin/datastructures/backends/composite_dicts.py
index ac89e69da..a0c599dc8 100644
--- a/src/moin/datastructures/backends/composite_dicts.py
+++ b/src/moin/datastructures/backends/composite_dicts.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - dict access via various backends.
+MoinMoin - Dict access via various backends.
 """
 
 
@@ -11,7 +11,7 @@
 
 class CompositeDicts(BaseDictsBackend):
     """
-    Manage several dicts backends.
+    Manage several dict backends.
     """
 
     def __init__(self, *backends):
@@ -35,7 +35,7 @@ def __getitem__(self, dict_name):
 
     def __contains__(self, dict_name):
         """
-        Check if a dict called dict_name is available in any of the backends.
+        Check if a dict called <dict_name> is available in any of the backends.
         """
         for backend in self._backends:
             if dict_name in backend:
diff --git a/src/moin/datastructures/backends/composite_groups.py b/src/moin/datastructures/backends/composite_groups.py
index 9018f24f5..b4bb0db78 100644
--- a/src/moin/datastructures/backends/composite_groups.py
+++ b/src/moin/datastructures/backends/composite_groups.py
@@ -2,12 +2,10 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - group access via various backends.
+MoinMoin - Group access via various backends.
 
-The composite_groups is a backend that does not have direct storage,
-but composes other backends to a new one, so group definitions are
-retrieved from several backends. This allows to mix different
-backends.
+The composite_groups backend does not have direct storage; it composes other backends into a new
+one, so group definitions are retrieved from several backends. This allows mixing different backends.
 """
 
 
@@ -42,9 +40,8 @@ def __iter__(self):
         """
         Iterate over group names in all backends (filtering duplicates).
 
-        If a group with same name is defined in several backends, the
-        composite_groups backend yields only backend which is listed
-        earlier in self._backends.
+        If a group with the same name is defined in several backends, the composite_groups backend yields
+        only the one from the backend that is listed earlier in self._backends.
         """
         yielded_groups = set()
 
diff --git a/src/moin/datastructures/backends/config_dicts.py b/src/moin/datastructures/backends/config_dicts.py
index bd2fbfef0..939eccba8 100644
--- a/src/moin/datastructures/backends/config_dicts.py
+++ b/src/moin/datastructures/backends/config_dicts.py
@@ -2,9 +2,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - config dict backend
+MoinMoin - Config dict backend.
 
-The config group backend enables you to define dicts in a configuration file.
+The config dict backend enables you to define dicts in a configuration file.
 """
 
 
diff --git a/src/moin/datastructures/backends/config_groups.py b/src/moin/datastructures/backends/config_groups.py
index b64824e53..09b4ca382 100644
--- a/src/moin/datastructures/backends/config_groups.py
+++ b/src/moin/datastructures/backends/config_groups.py
@@ -2,9 +2,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - config groups backend
+MoinMoin - Config groups backend.
 
-The config_groups backend enables one to define groups and their
+The config_groups backend enables you to define groups and their
 members in a configuration file.
 """
 
@@ -20,8 +20,8 @@ class ConfigGroups(BaseGroupsBackend):
 
     def __init__(self, groups):
         """
-        :param groups: Dictionary of groups where key is group name,
-        and value is list of members of that group.
+        :param groups: Dictionary of groups where the key is the group name,
+        and the value is the list of members of that group.
         """
         super().__init__()
 
diff --git a/src/moin/datastructures/backends/config_lazy_groups.py b/src/moin/datastructures/backends/config_lazy_groups.py
index 226ef2f9f..760aa26b6 100644
--- a/src/moin/datastructures/backends/config_lazy_groups.py
+++ b/src/moin/datastructures/backends/config_lazy_groups.py
@@ -2,13 +2,11 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - config group lazy backend.
+MoinMoin - Config group lazy backend.
 
-    The config group backend allows one to define groups in a
-    configuration file.
+The config group backend allows you to define groups in a configuration file.
 
-    NOTE that this is proof-of-concept implementation. LDAP backend
-    should be based on this concept.
+NOTE: this is a proof-of-concept implementation. An LDAP backend should be based on this concept.
 """
 
 
diff --git a/src/moin/datastructures/backends/wiki_dicts.py b/src/moin/datastructures/backends/wiki_dicts.py
index 5d7de325c..22627736a 100644
--- a/src/moin/datastructures/backends/wiki_dicts.py
+++ b/src/moin/datastructures/backends/wiki_dicts.py
@@ -5,7 +5,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - WikiDict functions.
+MoinMoin - WikiDict functions.
 """
 
 
@@ -17,10 +17,7 @@
 
 
 class WikiDict(BaseDict):
-    """
-    Mapping of keys to values from meta of an item.
-
-    """
+    """Mapping of keys to values from an item's metadata."""
 
     def _load_dict(self):
         dict_name = self.name
@@ -30,7 +27,7 @@ def _load_dict(self):
             wikidict = rev.meta.get(WIKIDICT, {})
             return wikidict
         except KeyError:
-            flash(f'WikiDict "{dict_name}" does not exist or it has invalid syntax within metadata.')
+            flash(f'WikiDict "{dict_name}" does not exist or has invalid syntax in its metadata.')
             raise DictDoesNotExistError(dict_name)
 
 
diff --git a/src/moin/datastructures/backends/wiki_groups.py b/src/moin/datastructures/backends/wiki_groups.py
index 80bbc2c33..9f2c6aa4d 100644
--- a/src/moin/datastructures/backends/wiki_groups.py
+++ b/src/moin/datastructures/backends/wiki_groups.py
@@ -4,14 +4,13 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - wiki group backend
+MoinMoin - Wiki group backend.
 
-The wiki_groups backend allows to define groups on wiki items.
+The wiki_groups backend allows you to define groups on wiki items.
 
-Normally, the name of the group item has to end with Group like
-FriendsGroup. This lets MoinMoin recognize it as a group. This default
-pattern could be changed (e.g. for non-english languages etc.), see
-HelpOnConfiguration.
+Normally, the name of a group item must end with "Group", like FriendsGroup. This lets MoinMoin
+recognize it as a group. This default pattern can be changed (e.g., for non-English languages);
+see HelpOnConfiguration.
 """
 
 from flask import g as flaskg
diff --git a/src/moin/error.py b/src/moin/error.py
index 3ad4fac6e..316807fbe 100644
--- a/src/moin/error.py
+++ b/src/moin/error.py
@@ -2,25 +2,25 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin errors / exception classes
+MoinMoin errors / exception classes.
 """
 
 import sys
 
 
 class Error(Exception):
-    """Base class for moin moin errors
+    """Base class for MoinMoin errors.
 
-    Use this class when you raise errors or create sub classes that
-    may be used to display non ASCII error message.
+    Use this class when you raise errors or create subclasses that
+    may be used to display non-ASCII error messages.
 
-    Standard errors work safely only with strings using ascii or
-    unicode. This class can be used safely with both strings using
-    CHARSET and unicode.
+    Standard errors work safely only with strings using ASCII or
+    Unicode. This class can be used safely with both strings using
+    CHARSET and Unicode.
 
-    You can init this class with either unicode or string using
+    You can initialize this class with either Unicode or a string using
     CHARSET encoding. On output, the class will convert the string
-    to unicode or the unicode to string, using CHARSET.
+    to Unicode or the Unicode to string, using CHARSET.
 
     When you want to render an error, use unicode() or str() as needed.
     """
@@ -37,7 +37,7 @@ def __init__(self, message):
         self.message = message
 
     def __str__(self):
-        """Return str error message"""
+        """Return the error message as str."""
         return self.message
 
     def __getitem__(self, item):
@@ -46,29 +46,29 @@ def __getitem__(self, item):
 
 
 class CompositeError(Error):
-    """Base class for exceptions containing an exception
+    """Base class for exceptions containing another exception.
 
-    Do not use this class but its more specific sub classes.
+    Do not use this class directly; use its more specific subclasses.
 
-    Useful for hiding low level error inside high level user error,
+    Useful for hiding a low-level error inside a high-level user-facing error,
     while keeping the inner error information for debugging.
 
     Example::
 
         class InternalError(CompositeError):
-            ''' Raise for internal errors '''
+            '''Raise for internal errors.'''
 
         try:
             # code that might fail...
         except HairyLowLevelError:
-            raise InternalError("Sorry, internal error occurred")
+            raise InternalError("Sorry, an internal error occurred")
 
-    When showing a traceback, both InternalError traceback and
+    When showing a traceback, both the InternalError traceback and the
     HairyLowLevelError traceback are available.
     """
 
     def __init__(self, message):
-        """Save system exception info before this exception is raised"""
+        """Save system exception info before this exception is raised."""
         Error.__init__(self, message)
         self.innerException = sys.exc_info()
 
@@ -85,15 +85,15 @@ def exceptions(self):
 
 
 class FatalError(CompositeError):
-    """Base class for fatal error we can't handle
+    """Base class for fatal errors we can't handle.
 
-    Do not use this class but its more specific sub classes.
+    Do not use this class directly; use its more specific subclasses.
     """
 
 
 class ConfigurationError(FatalError):
-    """Raise when fatal misconfiguration is found"""
+    """Raised when a fatal misconfiguration is found."""
 
 
 class InternalError(FatalError):
-    """Raise when internal fatal error is found"""
+    """Raised when an internal fatal error is found."""
diff --git a/src/moin/forms.py b/src/moin/forms.py
index 9dddeb5a5..55f30af0d 100644
--- a/src/moin/forms.py
+++ b/src/moin/forms.py
@@ -4,9 +4,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - Flatland widgets
+MoinMoin - Flatland form widgets.
 
-    General Flatland widgets containing hints for the templates.
+General Flatland widgets containing hints for the templates.
 """
 
 
diff --git a/src/moin/help/__init__.py b/src/moin/help/__init__.py
index 83fec71d7..cba167456 100644
--- a/src/moin/help/__init__.py
+++ b/src/moin/help/__init__.py
@@ -2,5 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - help system
+MoinMoin - Help system
+
+This package contains help-related components.
 """
diff --git a/src/moin/i18n/__init__.py b/src/moin/i18n/__init__.py
index 379ca6e27..f61cde129 100644
--- a/src/moin/i18n/__init__.py
+++ b/src/moin/i18n/__init__.py
@@ -5,13 +5,13 @@
 """
 MoinMoin - i18n (internationalization) and l10n (localization) support
 
-To use this, please use exactly this line (no less, no more)::
+To use this, import exactly these names (no less, no more):
 
     from moin.i18n import _, L_, N_
 
-    # _ == gettext
-    # N_ == ngettext
-    # L_ == lazy_gettext
+    # _ is gettext
+    # N_ is ngettext
+    # L_ is lazy_gettext
 """
 
 
@@ -34,26 +34,26 @@
 
 
 def i18n_init(app):
-    """initialize Flask-Babel"""
+    """Initialize Flask-Babel."""
     Babel(app, locale_selector=get_locale, timezone_selector=get_timezone)
 
 
 def get_locale():
-    """return the locale for the current user"""
+    """Return the locale for the current user."""
     locale = None
-    # this might be called at a time when flaskg.user is not setup yet:
+    # This may be called when flaskg.user is not set up yet:
     u = getattr(flaskg, "user", None)
     if u and u.locale is not None:
-        # locale is given in user profile, use it
+        # The locale is set in the user profile; use it.
         locale = u.locale
         logging.debug(f"user locale = {locale!r}")
     else:
-        # try to guess the language from the user accept
-        # header the browser transmits. The best match wins.
+        # Try to guess the language from the Accept-Language header sent by the browser.
+        # The best match wins.
         cli_no_request_ctx = False
         try:
             logging.debug(f"request.accept_languages = {request.accept_languages!r}")
-        except RuntimeError:  # CLI call has no valid request context
+        except RuntimeError:  # CLI calls have no valid request context.
             cli_no_request_ctx = True
 
         supported_locales = [Locale("en")] + current_app.extensions["babel"].instance.list_translations()
@@ -70,8 +70,8 @@ def get_locale():
 
 
 def get_timezone():
-    """return the timezone for the current user"""
-    # this might be called at a time when flaskg.user is not setup yet:
+    """Return the timezone for the current user."""
+    # This may be called when flaskg.user is not set up yet:
     u = getattr(flaskg, "user", None)
     if u and u.timezone is not None:
         return u.timezone
@@ -81,10 +81,11 @@ def get_timezone():
 # https://github.com/lalinsky/flask-babel/commit/09ee1702c7129598bb202aa40a0e2e19f5414c24
 @contextmanager
 def force_locale(locale):
-    """Temporarily overrides the currently selected locale. Sometimes
-    it is useful to switch the current locale to different one, do
-    some tasks and then revert back to the original one. For example,
-    if the user uses German on the web site, but you want to send
+    """Temporarily override the currently selected locale.
+
+    Sometimes it is useful to switch the current locale to a different one,
+    perform some tasks, and then revert to the original. For example,
+    if the user uses German on the website, but you want to send
     them an email in English, you can use this function as a context
     manager::
 
diff --git a/src/moin/i18n/_tests/test_i18n.py b/src/moin/i18n/_tests/test_i18n.py
index c3baf5a63..924499c70 100644
--- a/src/moin/i18n/_tests/test_i18n.py
+++ b/src/moin/i18n/_tests/test_i18n.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Test for i18n
+Tests for i18n
 """
 
 import pytest
@@ -24,15 +24,15 @@ def test_user_attributes():
 
 
 def test_text():
-    # test for gettext
+    # Test gettext
     result = _("test_text")
     assert result == "test_text"
 
-    # test for lazy_gettext
+    # Test lazy_gettext
     result = L_("test_lazy_text")
     assert result == "test_lazy_text"
 
-    # test for ngettext
+    # Test ngettext
     result1 = N_("text1", "text2", 1)
     assert result1 == "text1"
     result2 = N_("text1", "text2", 2)
diff --git a/src/moin/items/__init__.py b/src/moin/items/__init__.py
index 0b7906ff7..00021f239 100644
--- a/src/moin/items/__init__.py
+++ b/src/moin/items/__init__.py
@@ -9,13 +9,11 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - high-level (frontend) items
+MoinMoin - High-level (frontend) items
 
-    While moin.storage cares for backend storage of items,
-    this module cares for more high-level, frontend items,
-    e.g. showing, editing, etc. of wiki items.
+While moin.storage handles backend storage of items, this module focuses on higher-level, frontend operations such as showing and editing wiki items.
 
-    Each class in this module corresponds to an itemtype.
+Each class in this module corresponds to an item type.
 """
 
 from time import time, strftime
diff --git a/src/moin/items/_tests/test_Blog.py b/src/moin/items/_tests/test_Blog.py
index 0b8a1304a..a055fcc5b 100644
--- a/src/moin/items/_tests/test_Blog.py
+++ b/src/moin/items/_tests/test_Blog.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.items.blog Tests
+MoinMoin - Tests for moin.items.blog
 """
 
 import re
@@ -64,7 +64,7 @@ def _publish_entry(self, entry, ptime, acl=None):
     def test_create(self):
         item = Item.create(self.name, itemtype=ITEMTYPE_BLOG)
         item._save(self.meta, self.data, comment=self.comment)
-        # check save result
+        # Check save result
         item = Item.create(self.name)
         assert isinstance(item, Blog)
         assert item.itemtype == ITEMTYPE_BLOG
@@ -73,40 +73,40 @@ def test_create(self):
     def test_do_show_empty(self):
         item = Item.create(self.name, itemtype=ITEMTYPE_BLOG)
         item._save(self.meta, self.data, comment=self.comment)
-        # empty blog page without any entries
+        # Empty blog page without any entries
         data_tokens = [self.data, self.NO_ENTRIES_MSG]
         self._test_view(self.name, data_tokens=data_tokens)
 
     def test_do_show_entries(self):
         item = Item.create(self.name, itemtype=ITEMTYPE_BLOG)
         item._save(self.meta, self.data, comment=self.comment)
-        # store entries without PTIME
+        # Store entries without PTIME
         for entry in self.entries:
             item = Item.create(entry["name"], itemtype=ITEMTYPE_BLOG_ENTRY)
             item._save(self.entry_meta, entry["data"], comment=self.comment)
-        # the blog is not empty
+        # The blog is not empty
         exclude_data_tokens = [self.NO_ENTRIES_MSG]
-        # all stored blog entries are listed on the blog index page
+        # All stored blog entries are listed on the blog index page
         data_tokens = [self.data] + [entry["data"] for entry in self.entries]
         self._test_view(self.name, data_tokens=data_tokens, exclude_data_tokens=exclude_data_tokens)
 
     def test_do_show_sorted_entries(self):
         item = Item.create(self.name, itemtype=ITEMTYPE_BLOG)
         item._save(self.meta, self.data, comment=self.comment)
-        # store entries
+        # Store entries
         for entry in self.entries:
             item = Item.create(entry["name"], itemtype=ITEMTYPE_BLOG_ENTRY)
             item._save(self.entry_meta, entry["data"], comment=self.comment)
-        # Add PTIME to some of the entries, ptime value is a UNIX timestamp. If PTIME
-        # is not defined, we use MTIME as publication time (which is usually in the past).
+        # Add PTIME to some of the entries. PTIME value is a Unix timestamp. If PTIME
+        # is not defined, we use MTIME as the publication time (which is usually in the past).
         self._publish_entry(self.entries[0], ptime=2000)
         self._publish_entry(self.entries[1], ptime=1000)
         time_in_future = utctimestamp(datetime(2029, 1, 1))
         self._publish_entry(self.entries[2], ptime=time_in_future)
-        # the blog is not empty
+        # The blog is not empty
         exclude_data_tokens = [self.NO_ENTRIES_MSG]
-        # blog entries are listed in reverse order relative to their PTIME/MTIMEs,
-        # entries published in the future are also listed here
+        # Blog entries are listed in reverse order relative to their PTIME/MTIME values;
+        # entries published in the future are also listed here.
         ordered_data = [
             self.data,
             self.entries[2]["data"],
@@ -120,7 +120,7 @@ def test_do_show_sorted_entries(self):
     def test_filter_by_tag(self):
         item = Item.create(self.name, itemtype=ITEMTYPE_BLOG)
         item._save(self.meta, self.data, comment=self.comment)
-        # publish some entries with tags
+        # Publish some entries with tags
         entries_meta = [
             {PTIME: 1000, TAGS: ["foo", "bar", "moin"]},
             {PTIME: 3000, TAGS: ["foo", "bar", "baz"]},
@@ -130,7 +130,7 @@ def test_filter_by_tag(self):
             entry_meta.update(self.entry_meta)
             item = Item.create(entry["name"], itemtype=ITEMTYPE_BLOG_ENTRY)
             item._save(entry_meta, entry["data"], comment=self.comment)
-        # filter by non-existent tag 'non-existent'
+        # Filter by the non-existent tag 'non-existent'
         data_tokens = [self.data, self.NO_ENTRIES_MSG]
         exclude_data_tokens = [self.entries[0]["data"], self.entries[1]["data"], self.entries[2]["data"]]
         self._test_view(
@@ -139,7 +139,7 @@ def test_filter_by_tag(self):
             data_tokens=data_tokens,
             exclude_data_tokens=exclude_data_tokens,
         )
-        # filter by tag 'moin'
+        # Filter by tag 'moin'
         exclude_data_tokens = [self.NO_ENTRIES_MSG, self.entries[1]["data"]]
         ordered_data = [self.data, self.entries[2]["data"], self.entries[0]["data"]]
         regex = re.compile(r"{}.*{}.*{}".format(*ordered_data), re.DOTALL)
@@ -148,17 +148,17 @@ def test_filter_by_tag(self):
     def test_filter_by_acls(self):
         item = Item.create(self.name, itemtype=ITEMTYPE_BLOG)
         item._save(self.meta, self.data, comment=self.comment)
-        # store some unpublished entries
+        # Store some unpublished entries
         for entry in self.entries:
             item = Item.create(entry["name"], itemtype=ITEMTYPE_BLOG_ENTRY)
             item._save(self.entry_meta, entry["data"], comment=self.comment)
-        # publish the first three entries with specific ACLs
-        # we are an "anonymous" user
+        # Publish the first three entries with specific ACLs
+        # We are an "anonymous" user.
         self._publish_entry(self.entries[0], ptime=1000, acl="%s:read" % ANON)
         self._publish_entry(self.entries[1], ptime=3000, acl="%s:read" % ANON)
-        # specify no rights on the 3rd entry
+        # Specify no rights on the third entry.
         self._publish_entry(self.entries[2], ptime=2000, acl="%s:" % ANON)
-        # the blog is not empty and the 3rd entry is not displayed
+        # The blog is not empty, and the third entry is not displayed.
         exclude_data_tokens = [self.NO_ENTRIES_MSG, self.entries[2]["data"]]
         ordered_data = [self.data, self.entries[1]["data"], self.entries[0]["data"]]
         regex = re.compile(r"{}.*{}.*{}".format(*ordered_data), re.DOTALL)
@@ -176,23 +176,23 @@ class TestBlogEntry(TestView):
     entry_meta = {CONTENTTYPE: contenttype, ITEMTYPE: ITEMTYPE_BLOG_ENTRY}
 
     def test_create(self):
-        # create a blog item
+        # Create a blog item
         item = Item.create(self.blog_name, itemtype=ITEMTYPE_BLOG)
         item._save(self.blog_meta, self.blog_data, comment=self.comment)
-        # create a blog entry item
+        # Create a blog entry item
         item = Item.create(self.entry_name, itemtype=ITEMTYPE_BLOG_ENTRY)
         item._save(self.entry_meta, self.entry_data, comment=self.comment)
-        # check save result
+        # Check save result
         item = Item.create(self.entry_name)
         assert isinstance(item, BlogEntry)
         assert item.itemtype == ITEMTYPE_BLOG_ENTRY
         assert item.meta[CONTENTTYPE] == self.contenttype
 
     def test_do_show(self):
-        # create a blog item
+        # Create a blog item
         item = Item.create(self.blog_name, itemtype=ITEMTYPE_BLOG)
         item._save(self.blog_meta, self.blog_data, comment=self.comment)
-        # create a blog entry item
+        # Create a blog entry item
         item = Item.create(self.entry_name, itemtype=ITEMTYPE_BLOG_ENTRY)
         item._save(self.entry_meta, self.entry_data, comment=self.comment)
 
diff --git a/src/moin/items/_tests/test_Content.py b/src/moin/items/_tests/test_Content.py
index 6eb30e9ba..13acc80f9 100644
--- a/src/moin/items/_tests/test_Content.py
+++ b/src/moin/items/_tests/test_Content.py
@@ -4,7 +4,7 @@
 # split
 
 """
-    MoinMoin - moin.items.content Tests
+MoinMoin - Tests for moin.items.content
 """
 
 import pytest
@@ -24,7 +24,7 @@
 
 
 class TestContent:
-    """Test for arbitrary content"""
+    """Tests for arbitrary content"""
 
     def testClassFinder(self):
         for contenttype, ExpectedClass in [
@@ -68,12 +68,12 @@ def test_get_templates(self):
 
 class TestTarItems:
     """
-    tests for the container items
+    Tests for container items
     """
 
     def testCreateContainerRevision(self):
         """
-        creates a container and tests the content saved to the container
+        Creates a container and tests the content saved to it.
         """
         item_name = "ContainerItem1"
         item = Item.create(item_name, itemtype=ITEMTYPE_DEFAULT, contenttype="application/x-tar")
@@ -90,7 +90,7 @@ def testCreateContainerRevision(self):
 
     def testRevisionUpdate(self):
         """
-        creates two revisions of a container item
+        Creates two revisions of a container item.
         """
         item_name = "ContainerItem2"
         item = Item.create(item_name, itemtype=ITEMTYPE_DEFAULT, contenttype="application/x-tar")
@@ -107,7 +107,7 @@ def testRevisionUpdate(self):
 
 
 class TestZipMixin:
-    """Test for zip-like items"""
+    """Tests for zip-like items"""
 
     def test_put_member(self):
         item_name = "Zip_file"
@@ -148,15 +148,15 @@ def test__render_data_diff(self):
             from PIL import Image as PILImage  # noqa
 
             result = Markup(TransformableBitmapImage._render_data_diff(item1.content, item.rev, item1.rev))
-            # On Werkzeug 0.8.2+, urls with '+' are automatically encoded to '%2B'
+            # On Werkzeug 0.8.2+, URLs with '+' are automatically encoded to '%2B'
             # The assert statement works with both older and newer versions of Werkzeug
-            # Probably not an intentional change on the werkzeug side, see issue:
+            # Probably not an intentional change on the Werkzeug side; see issue:
             # https://github.com/mitsuhiko/werkzeug/issues/146
             assert str(result).startswith('<img src="/+diffraw/image_Item?rev') or str(result).startswith(
                 '<img src="/%2Bdiffraw/image_Item?rev'
             )
         except ImportError:
-            # no PIL
+            # No PIL
             pass
 
     def test__render_data_diff_text(self):
@@ -214,23 +214,23 @@ def test__render_data_diff(self):
         item = Item.create(item_name)
         item._save(meta, empty_html)
         item = Item.create(item_name)
-        # Unicode test, html escaping
+        # Unicode test: HTML escaping
         rev1 = update_item(item_name, meta, html)
         rev2 = update_item(item_name, {}, "     ")
         result = Text._render_data_diff(item.content, rev1, rev2, fqname=fqname)
         assert escape(html) in result
-        # Unicode test, whitespace
+        # Unicode test: whitespace
         rev1 = update_item(item_name, {}, "\n\n")
         rev2 = update_item(item_name, {}, "\n     \n")
         result = Text._render_data_diff(item.content, rev1, rev2, fqname=fqname)
         assert "<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>" in result
-        # If fairly similar diffs are correctly spanned or not, also check indent
+        # Check whether fairly similar diffs are correctly spanned; also check indentation.
         rev1 = update_item(item_name, {}, "One Two Three Four\nSix\n\ud55c")
         rev2 = update_item(item_name, {}, "Two Three Seven Four\nSix\n\ud55c")
         result = Text._render_data_diff(item.content, rev1, rev2, fqname=fqname)
         assert "<span>One </span>Two Three Four" in result
         assert "Two Three <span>Seven </span>Four" in result
-        # Check for diff_html.diff return types
+        # Check the return types of diff_html.diff
         assert reduce(
             lambda x, y: x and y,
             [
diff --git a/src/moin/items/_tests/test_Item.py b/src/moin/items/_tests/test_Item.py
index bdcaa5000..ecc02b3e1 100644
--- a/src/moin/items/_tests/test_Item.py
+++ b/src/moin/items/_tests/test_Item.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.items Tests
+MoinMoin - Tests for moin.items
 """
 
 import pytest
@@ -74,10 +74,10 @@ def build_index(basename, relnames):
 def build_mixed_index(basename, spec):
     """
     Build a list of MixedIndexEntry by hand, useful as a test helper for index testing.
-    The mixed index is a combo of dirs and files with empty meta (dirs) or reduced
+    The mixed index is a combination of directories and files with empty meta (dirs) or reduced
     meta (files).
 
-    :spec is a list of (relname, hassubitem) tuples.
+    spec is a list of (relname, hassubitem) tuples.
     """
     files = [
         (
@@ -105,8 +105,8 @@ def build_mixed_index(basename, spec):
 
 def fix_meta(files, builds):
     """
-    Fix potential problem of datetimes being slightly different within files and builds metadata.
-    Also fix problem where userid is in files metadata but missing from builds metadata.
+    Fix a potential problem of datetimes being slightly different within files and builds metadata.
+    Also fix the problem where the user ID is in the files metadata but missing from the builds metadata.
     """
     fix_files = []
     fix_builds = []
@@ -177,7 +177,7 @@ def testCRUD(self):
         assert saved_data == b""
 
     def testIndex(self):
-        # create a toplevel and some sub-items
+        # Create a top-level item and some sub-items
         basename = "Foo"
         for name in ["", "/ab", "/cd/ef", "/gh", "/ij", "/ij/kl"]:
             item = Item.create(basename + name)
@@ -192,20 +192,20 @@ def testIndex(self):
         dirs, files = baseitem.get_index()
         assert dirs == build_dirs_index(basename, ["cd", "ij"])
 
-        # after +index converted to table output it shows subitems
+        # After +index was converted to table output, it shows subitems
         builds = build_index(basename, ["ab", "cd/ef", "gh", "ij", "ij/kl", "mn"])
-        # fix potential problem of datetime and userid being different
+        # Fix potential differences in datetime and user ID
         fix_files, fix_builds = fix_meta(files, builds)
         assert fix_files == fix_builds
 
-        # check filtered index when startswith param is passed
+        # Check the filtered index when the 'startswith' parameter is passed
         dirs, files = baseitem.get_index(startswith="a")
         assert dirs == []
         builds = build_index(basename, ["ab"])
         fix_files, fix_builds = fix_meta(files, builds)
         assert fix_files == fix_builds
 
-        # check filtered index when contenttype_groups is passed
+        # Check the filtered index when 'contenttype_groups' is passed
         ctgroups = ["Other Text Items"]
         dirs, files = baseitem.get_index(selected_groups=ctgroups)
         assert dirs == build_dirs_index(basename, ["cd", "ij"])
diff --git a/src/moin/items/blog.py b/src/moin/items/blog.py
index dccdcdd1a..e6fe99657 100644
--- a/src/moin/items/blog.py
+++ b/src/moin/items/blog.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Blog itemtype
+MoinMoin - Blog item type
 """
 
 
@@ -56,13 +56,13 @@ def do_show(self, revid, **kwargs):
         """
         Show a blog item and a list of its blog entries below it.
 
-        If tag GET-parameter is defined, the list of blog entries consists only
-        of those entries that contain the tag value in their lists of tags.
+        If the tag GET parameter is defined, the list of blog entries consists only
+        of those entries that contain the tag value in their list of tags.
         """
-        # for now it is just one tag=value, later it could be tag=value1&tag=value2&...
+        # For now it is just one tag=value; later it could be tag=value1&tag=value2&...
         tag = request.values.get("tag")
         prefix = self.name + "/"
-        # Only blog entry itemtypes and sub items of this item
+        # Only blog entry item types and subitems of this item
         terms = [Term(ITEMTYPE, ITEMTYPE_BLOG_ENTRY), Prefix(NAME_EXACT, prefix)]
         if tag:
             terms.append(Term(TAGS, tag))
@@ -109,7 +109,7 @@ class _ModifyForm(Default._ModifyForm):
         @classmethod
         def from_item(cls, item):
             form = super().from_item(item)
-            # preload PTIME with the current datetime
+            # Preload PTIME with the current date and time
             if not form["meta_form"]["ptime"]:
                 form["meta_form"]["ptime"].set(datetime.utcnow())
             return form
diff --git a/src/moin/items/content.py b/src/moin/items/content.py
index 82cfab22f..8ce648cf4 100644
--- a/src/moin/items/content.py
+++ b/src/moin/items/content.py
@@ -9,13 +9,13 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - item contents
+MoinMoin - Item content
 
-    Classes handling the content part of items (ie. minus metadata). The
-    content part is sometimes called the "data" part in other places, but is
-    always called content in this module to avoid confusion.
+Classes that handle the content part of items (i.e., excluding metadata). The
+content part is sometimes called the "data" part in other places, but it is
+consistently called content in this module to avoid confusion.
 
-    Each class in this module corresponds to a contenttype value.
+Each class in this module corresponds to a content type value.
 """
 
 from __future__ import annotations
@@ -112,7 +112,7 @@ def __init__(self, group_names):
 
     def register(self, e, group):
         """
-        Register a contenttype entry and optionally add it to a specific group.
+        Register a content type entry and optionally add it to a specific group.
         """
         # If group is specified and contenttype is not a wildcard one
         if group and e.content_type.type and e.content_type.subtype:
diff --git a/src/moin/items/ticket.py b/src/moin/items/ticket.py
index 62098bbcb..0e83b041d 100644
--- a/src/moin/items/ticket.py
+++ b/src/moin/items/ticket.py
@@ -2,37 +2,37 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Ticket itemtype
+MoinMoin - Ticket item type
 
 TODO: Tickets require more work. Key requirements include but are not limited to:
 
- - ability to edit the original description or subsequent comments to correct typos
- - rework global history and global index to show or not show tickets and/or comments
- - rework page trail, subscriptions, navigation links to show something other than rev ids or timestamps
- - some method to override the default parser (text/x.moin.wiki) for a new ticket or comment
- - add more comments to the code
+ - Ability to edit the original description or subsequent comments to correct typos
+ - Rework global history and global index to show or not show tickets and/or comments
+ - Rework page trail, subscriptions, and navigation links to show something other than rev IDs or timestamps
+ - Provide a method to override the default parser (text/x.moin.wiki) for a new ticket or comment
+ - Add more comments to the code
 
-A ticket is a unique itemtype, the initial ticket consists of a description and meta data.
-Some of the meta data fields are unique to tickets.
+A ticket is a special item type: the initial ticket consists of a description and metadata.
+Some of the metadata fields are unique to tickets.
 
 The original design called for tickets to be nameless. Instead of a name, tickets would
-have a summary in meta data that would be too long for a typical wiki item name. However,
+have a summary in metadata that could be too long for a typical wiki item name. However,
 it is not currently possible to create a nameless item, so as a workaround, tickets are created
 with a name similar to: ticket_2016_09_21-09_19_29.
 
-When a ticket's meta data is updated, a new revision is created and the ticket's name is removed.
-After the first update, the current revision has an Old Name, after the second meta data update,
+When a ticket’s metadata is updated, a new revision is created and the ticket’s name is removed.
+After the first update, the current revision has an Old Name; after the second metadata update,
 the current name and Old Name are both displayed as None.
 
-Ticket comments and ticket comments to comments are presently created without an item type.
+Ticket comments and replies to comments are presently created without an item type.
 This is an issue because when a wiki is dumped and restored, all comments are tagged with an
-itemtype of "default". This is probably not wanted, but no other problems after a restore were
+item type of "default". This is probably not wanted, but no other problems after a restore were
 noted.
 
 As a workaround to the issue of creating nameless items, comments are created with a
-name similar to: comment_2016_09_21-09_19_29. As comments can not currently be updated,
-the name is never removed. Comments and comments to comments are linked to the original
-ticket through a refers_to field preserved in meta data.
+name similar to: comment_2016_09_21-09_19_29. As comments cannot currently be updated,
+the name is never removed. Comments and replies to comments are linked to the original
+ticket through a refers_to field preserved in metadata.
 """
 
 import time
diff --git a/src/moin/log.py b/src/moin/log.py
index fc293dda9..a9f0c1c95 100644
--- a/src/moin/log.py
+++ b/src/moin/log.py
@@ -2,52 +2,52 @@
 # Copyright: 2007 MoinMoin:JohannesBerg
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 """
-    MoinMoin - init "logging" system
+    MoinMoin - initialize the "logging" system.
 
     WARNING
     -------
-    logging must be configured VERY early, before the code in log.getLogger
+    Logging must be configured VERY early, before the code in log.getLogger
     gets executed. Thus, logging is configured either by:
 
     a) an environment variable MOINLOGGINGCONF that contains the path/filename
-       of a logging configuration file - this method overrides all following
+       of a logging configuration file — this method overrides all following
        methods (except if it can't read or use that configuration, then it
        will use c))
-    b) by an explicit call to moin.log.load_config('logging.conf') -
+    b) an explicit call to moin.log.load_config('logging.conf') —
        you need to do this very early or a) or c) will happen before
-    c) by using a builtin fallback logging conf
+    c) using a built-in fallback logging configuration
 
     If logging is not yet configured, log.getLogger will do an implicit
-    configuration call - then a) or c) is done.
+    configuration call — then a) or c) is done.
 
     Usage (for wiki server admins)
     ------------------------------
-    Either use something like this in some shell script:
+    Either use something like this in a shell script:
     MOINLOGGINGCONF=/path/to/logging.conf
     export MOINLOGGINGCONF
 
-    Or, modify your server adaptor script (e.g. moin.cgi) to do this::
+    Or, modify your server adapter script (e.g., moin.cgi) to do this::
 
         from moin import log
-        log.load_config('contrib/logging/logfile') # XXX please fix this path!
+        log.load_config('contrib/logging/logfile')  # XXX please fix this path!
 
     You have to fix that path to use a logging configuration matching your
-    needs (we provide some examples in the path given there, it is relative to
-    the uncompressed moin distribution archive - if you use some moin package,
-    you maybe find it under /usr/share/moin/).
+    needs (we provide some examples in the path given there; it is relative to
+    the uncompressed Moin distribution archive — if you use a Moin package,
+    you may find it under /usr/share/moin/).
     It is likely that you also have to edit the sample logging configurations
-    we provide (e.g. to fix the logfile location).
+    we provide (e.g., to fix the log file location).
 
     Usage (for developers)
     ----------------------
-    If you write code for moin, do this at top of your module::
+    If you write code for Moin, do this at the top of your module::
 
        from moin import log
        logging = log.getLogger(__name__)
 
-    This will create a logger with 'moin.your.module' as name.
-    The logger can optionally get configured in the logging configuration.
-    If you don't configure it, some upperlevel logger (e.g. the root logger)
+    This will create a logger with 'moin.your.module' as its name.
+    The logger can optionally be configured in the logging configuration.
+    If you don't configure it, some upper-level logger (e.g., the root logger)
     will do the logging.
 """
 
@@ -62,14 +62,14 @@
 from io import StringIO
 
 # This is the "last resort" fallback logging configuration for the case
-# that load_config() is either not called at all or with a non-working
+# that load_config() is either not called at all or is called with a non-working
 # logging configuration.
 # See http://docs.python.org/library/logging.html#configuring-logging
-# We just use stderr output by default, if you want anything else,
+# We just use stderr output by default; if you want anything else,
 # you will have to configure logging.
 logging_config = """\
 [DEFAULT]
-# Default loglevel, to adjust verbosity: DEBUG, INFO, WARNING, ERROR, CRITICAL
+# Default log level; to adjust verbosity: DEBUG, INFO, WARNING, ERROR, CRITICAL
 loglevel=INFO
 
 [loggers]
@@ -120,17 +120,17 @@ def _log_warning(message, category, filename, lineno, file=None, line=None):
 
 
 def load_config(conf_fname=None):
-    """load logging config from conffile"""
+    """Load logging config from a config file."""
     global configured
     err_msg = None
     conf_fname = os.environ.get("MOINLOGGINGCONF", conf_fname)
     if conf_fname:
         try:
             conf_fname = os.path.abspath(conf_fname)
-            # we open the conf file here to be able to give a reasonable
+            # We open the config file here to be able to give a reasonable
             # error message in case of failure (if we give the filename to
             # fileConfig(), it silently ignores unreadable files and gives
-            # unhelpful error msgs like "No section: 'formatters'"):
+            # unhelpful error messages like "No section: 'formatters'"):
             f = open(conf_fname)
             try:
                 logging.config.fileConfig(f)
@@ -143,7 +143,7 @@ def load_config(conf_fname=None):
         except Exception as err:  # XXX be more precise
             err_msg = str(err)
     if not configured:
-        # load builtin fallback logging config
+        # load built-in fallback logging config
         with StringIO(logging_config) as f:
             logging.config.fileConfig(f)
         configured = True
@@ -160,10 +160,10 @@ def load_config(conf_fname=None):
 
 
 def getLogger(name: str | None):
-    """wrapper around logging.getLogger, so we can do some more stuff:
+    """Wrapper around logging.getLogger, so we can do some more stuff:
 
-    - preprocess logger name
-    - patch loglevel constants into logger object, so it can be used
+    - preprocess the logger name
+    - patch log level constants into the logger object, so it can be used
       instead of the logging module
     """
     if not configured:
@@ -176,14 +176,14 @@ def getLogger(name: str | None):
 
 class EmailHandler(logging.Handler):
     """A custom handler class which sends email for each logging event using
-    wiki mail configuration
+    the wiki mail configuration.
     """
 
     def __init__(self, toaddrs=[], subject=""):
-        """Initialize the handler
+        """Initialize the handler.
 
-        :param toaddrs: address or a list of email addresses whom to send email
-        :param subject: unicode email's subject
+        :param toaddrs: address or list of email addresses to send email to
+        :param subject: Unicode email subject
         """
         logging.Handler.__init__(self)
         if isinstance(toaddrs, str):
@@ -195,10 +195,10 @@ def __init__(self, toaddrs=[], subject=""):
     def emit(self, record):
         """Emit a record.
 
-        Send the record to the specified addresses
+        Send the record to the specified addresses.
         """
-        # the app config is accessible after logging is initialized, so set the
-        # arguments and make the decision to send mail or not here
+        # The app config is accessible after logging is initialized, so set the
+        # arguments and make the decision to send mail or not here.
         from flask import current_app as app
 
         try:
diff --git a/src/moin/macros/Anchor.py b/src/moin/macros/Anchor.py
index 25e2455f2..a212fa84d 100644
--- a/src/moin/macros/Anchor.py
+++ b/src/moin/macros/Anchor.py
@@ -2,8 +2,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - The Anchor Macro is used to create an anchor comprised of a span tag with
-an id attribute. Per HTML5 the id must be at least 1 character with no space characters.
+MoinMoin - Anchor macro.
+
+Creates an anchor as a span tag with an id attribute. Per HTML5, the id must be at least one character and contain no spaces.
 """
 
 from moin.utils.tree import moin_page
@@ -14,16 +15,16 @@
 class Macro(MacroInlineBase):
     def macro(self, content, arguments, page_url, alternative):
         if not arguments:
-            msg = _("Anchor macro failed - missing argument.")
+            msg = _("Anchor macro failed: missing anchor name.")
             return fail_message(msg, alternative)
 
         if len(arguments) > 1:
-            msg = _("Anchor macro failed - only 1 argument allowed.")
+            msg = _("Anchor macro failed: only one argument is allowed.")
             return fail_message(msg, alternative)
 
         anchor = arguments[0]
         if " " in anchor:
-            msg = _("Anchor macro failed - space is not allowed in anchors.")
+            msg = _("Anchor macro failed: spaces are not allowed in anchors.")
             return fail_message(msg, alternative)
 
         return moin_page.span(attrib={moin_page.id: anchor})
diff --git a/src/moin/macros/Date.py b/src/moin/macros/Date.py
index a6d422d88..137d12dd8 100644
--- a/src/moin/macros/Date.py
+++ b/src/moin/macros/Date.py
@@ -2,8 +2,8 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin Date macro - outputs the date for some specific point in time,
-adapted to the TZ settings of the user viewing the content.
+MoinMoin Date macro — outputs the date for a specific point in time,
+adapted to the user's time zone settings.
 """
 
 
@@ -17,12 +17,12 @@
 class MacroDateTimeBase(MacroInlineBase):
     def parse_time(self, args):
         """
-        Parse a time specification argument for usage by Date and DateTime macro.
+        Parse a time specification argument for usage by the Date and DateTime macros.
         Not all ISO 8601 format variations are accepted as input.
 
-        :param args: float/int UNIX timestamp or None or ISO 8601 formatted date time:
+        :param args: float/int UNIX timestamp, None, or ISO 8601–formatted date and time:
                      YYYY-MM-DDTHH:MM:SS (plus optional Z or z for UTC, or +/-HHMM) or
-                     YYYY-MM-DD HH:MM:SS (same as above but replacing T separator with " ")
+                     YYYY-MM-DD HH:MM:SS (same as above but replacing the T separator with " ")
         :returns: UNIX timestamp (UTC) or raises one of AttributeError, OSError, AssertionError, ValueError, OverflowError
         """
         if (
@@ -39,15 +39,15 @@ def parse_time(self, args):
             tzoffset = 0  # we assume UTC no matter if there is a Z
             if tz:
                 sign = tz[0]
-                if sign in "+-\u2212":  # ascii plus, ascii hyphen-minus, unicode minus
+                if sign in "+-\u2212":  # ASCII plus, ASCII hyphen-minus, Unicode minus
                     tzh, tzm = int(tz[1:3]), int(tz[3:])
                     tzoffset = (tzh * 60 + tzm) * 60
-                    if sign in "-\u2212":  # ascii hyphen-minus, unicode minus
+                    if sign in "-\u2212":  # ASCII hyphen-minus, Unicode minus
                         tzoffset = -tzoffset
             tm = year, month, day, hour, minute, second, 0, 0, 0
 
-            # as mktime wants a localtime argument (but we only have UTC),
-            # we adjust by our local timezone's offset
+            # As mktime wants a local-time argument (but we only have UTC),
+            # we adjust by our local time zone's offset
             tm = time.mktime(tm) - time.timezone - tzoffset
         else:
             tm = float(args)
diff --git a/src/moin/macros/DateTime.py b/src/moin/macros/DateTime.py
index eef916839..83fac5fe0 100644
--- a/src/moin/macros/DateTime.py
+++ b/src/moin/macros/DateTime.py
@@ -2,8 +2,8 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin DateTime macro - outputs the date and time for some specific point in time,
-adapted to the TZ settings of the user viewing the content.
+MoinMoin DateTime macro — outputs the date and time for a specific point in time,
+adapted to the user's time zone settings.
 """
 
 from moin.macros._base import fail_message
diff --git a/src/moin/macros/FontAwesome.py b/src/moin/macros/FontAwesome.py
index a090e8404..f8ea491cf 100644
--- a/src/moin/macros/FontAwesome.py
+++ b/src/moin/macros/FontAwesome.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Support use of Font Awesome fonts within wiki content.
+Support the use of Font Awesome icons within wiki content.
 
 Usage:
     <<FontAwesome(classes,color,size)>>
@@ -13,9 +13,9 @@
     <<FontAwesome(regular thumbs-up,red,2)>>
 
 Where:
-    classes: one or more Font Awesome classes less leading "fa-", separated by " ".
-    color: optional hex color code: #f00 or #ff0000 or HTML color name
-    size: optional int or float size in EM units
+    classes: One or more Font Awesome classes without the leading "fa-", separated by spaces.
+    color: Optional hex color code (#f00 or #ff0000) or an HTML color name.
+    size: Optional integer or float size in em units.
 """
 
 
diff --git a/src/moin/macros/GetText.py b/src/moin/macros/GetText.py
index da9e7da98..d13f109ed 100644
--- a/src/moin/macros/GetText.py
+++ b/src/moin/macros/GetText.py
@@ -3,12 +3,11 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Load I18N Text
+MoinMoin - load I18N text.
 
-This macro has the main purpose of supporting Help* page authors
-to insert the texts that a user actually sees on his screen into
-the description of the related features (which otherwise could
-get very confusing).
+This macro helps Help* page authors insert the texts that a user actually sees
+on their screen into the description of the related features (which otherwise
+could become very confusing).
 """
 
 
@@ -17,7 +16,7 @@
 
 
 class Macro(MacroInlineBase):
-    """Return a translation of args, or args as is"""
+    """Return a translation of the argument, or the argument as is."""
 
     def macro(self, content, arguments, page_url, alternative):
         translation = _(arguments[0])
diff --git a/src/moin/macros/GetVal.py b/src/moin/macros/GetVal.py
index 4588e176e..b8465cec5 100644
--- a/src/moin/macros/GetVal.py
+++ b/src/moin/macros/GetVal.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin GetVal macro - gets a value for a specified key from a dict.
+MoinMoin - GetVal macro retrieves a value for a specified key from a dict.
 """
 
 
diff --git a/src/moin/macros/HighlighterList.py b/src/moin/macros/HighlighterList.py
index f3487c158..0c5439401 100644
--- a/src/moin/macros/HighlighterList.py
+++ b/src/moin/macros/HighlighterList.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-HighlighterList - display a list of Pygments lexers
+HighlighterList - display a list of Pygments lexers.
 
 Usage: <<HighlighterList>>
 """
@@ -19,9 +19,9 @@ def macro(self, content, arguments, page_url, alternative):
         headings = (_("Lexer Name"), _("Lexer Aliases"), _("File Patterns"), _("Mimetypes"))
         rows = list(pygments.lexers.get_all_lexers())
         rows.sort(key=lambda t: tuple(t[0].lower()))
-        # Prevent traceback in converters/highlight.py when
-        # "..?regex=high" is appended to a Pygments Highlighter List
-        # A row above consists of [str, tuple, tuple, tuple] where singular tuples contain strings
+        # Prevent a traceback in converters/highlight.py when
+        # "..?regex=high" is appended to a Pygments Highlighter List.
+        # Each row consists of [str, tuple, tuple, tuple], where single-element tuples contain strings.
         pretty_rows = [[str(col) for col in row] for row in rows]
         table = TableMixin()
         ret = table.build_dom_table(pretty_rows, head=headings, cls="moin-sortable")
diff --git a/src/moin/macros/Icon.py b/src/moin/macros/Icon.py
index 9c04e4c0e..04c67a75a 100644
--- a/src/moin/macros/Icon.py
+++ b/src/moin/macros/Icon.py
@@ -2,12 +2,12 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Support use of icons within wiki content.
+Support the use of icons within wiki content.
 
-Unlike moin 1.x, moin 2 has one icon directory, not one per theme.
-Moin 1.x passed predefined alt text, width and height within the img tag;
-moin 2 assumes an error if icon is not rendered (alt text displayed in red font)
-and relies on client browser to render image based on its size.
+Unlike Moin 1.x, Moin 2 has a single icon directory rather than one per theme.
+Moin 1.x passed predefined alt text, width, and height within the <img> tag;
+Moin 2 assumes an error if an icon is not rendered (alt text displayed in red)
+and relies on the client browser to render the image based on its size.
 """
 
 
@@ -25,6 +25,6 @@ def macro(self, content, arguments, page_url, alternative):
             msg = _("Icon macro failed due to missing icon name.")
             return fail_message(msg, alternative)
         src = url_for("static", filename="img/icons/" + icon)
-        reason = _("Icon not rendered, invalid name")
+        reason = _("Icon not rendered (invalid name)")
         alt = f"<<Icon({icon})>> - {reason}"
         return html.img(attrib={html.src: src, html.alt: alt, html.class_: "moin-icon-macro"})
diff --git a/src/moin/macros/ItemList.py b/src/moin/macros/ItemList.py
index 62f1be968..ae03856ed 100644
--- a/src/moin/macros/ItemList.py
+++ b/src/moin/macros/ItemList.py
@@ -15,11 +15,11 @@
     item: the wiki item to select.  If no item is specified, then the
           current item is used.
 
-    startswith: the substring the item's descendents must begin with.
+    startswith: the substring the item's descendants must begin with.
                 If no value is specified, then no startswith-filtering
                 is applied.
 
-    regex: a regular expresssion the item's descendents must match.
+    regex: a regular expression the item's descendants must match.
            If no value is specified, then no regex-filtering is applied.
 
     ordered: Should the list be ordered or unordered list (<ol> or <ul>)?
@@ -48,14 +48,14 @@
 
 Notes:
 
-    All parameter values must be bracketed by matching quotes.  Singlequote
-    or doublequotes are okay.
+    All parameter values must be bracketed by matching quotes.  Single quotes
+    or double quotes are okay.
 
     The "startswith" and "regex" filters may be used together.  The "startswith"
-    filter is more efficient, since it's passed into the underlyng database query,
-    whereas the "regex" filter is applied on the results returned from the database.
+    filter is more efficient, since it's passed into the underlying database query,
+    whereas the "regex" filter is applied to the results returned from the database.
 
-    This is a block level macro, do not embed in a paragraph.
+    This is a block-level macro; do not embed it in a paragraph.
 
 Examples:
     <<ItemList>>
diff --git a/src/moin/macros/MailTo.py b/src/moin/macros/MailTo.py
index 7503155d1..5aadfdc6f 100644
--- a/src/moin/macros/MailTo.py
+++ b/src/moin/macros/MailTo.py
@@ -2,8 +2,10 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - MailTo Macro displays an E-Mail address (either a valid mailto: link for logged in users
-or the obfuscated display passed as the first macro argument).
+MoinMoin - MailTo macro displays an email address.
+
+For logged-in users, it shows a valid mailto: link; otherwise, it displays the
+obfuscated string passed as the first macro argument.
 """
 
 
@@ -19,7 +21,7 @@ class Macro(MacroInlineBase):
     def macro(self, content, arguments, page_url, alternative):
         """
         Invocation: <<MailTo(user AT example DOT org, write me)>>
-        where 2nd parameter is optional.
+        where the second parameter is optional.
         """
         if arguments:
             arguments = arguments[0].split(",")
@@ -36,11 +38,11 @@ def macro(self, content, arguments, page_url, alternative):
             text = ""
 
         if flaskg.user.valid:
-            # decode address and generate mailto: link
+            # Decode address and generate a mailto: link
             email = decodeSpamSafeEmail(email)
             result = moin_page.a(attrib={xlink.href: f"mailto:{email}"}, children=[text or email])
         else:
-            # unknown user, maybe even a spambot, so just return text as given in macro args
+            # Unknown user (or spambot): return the text as given in the macro args.
             if text:
                 text += " "
             result = moin_page.code(children=[text, f"<{email}>"])
diff --git a/src/moin/macros/MonthCalendar.py b/src/moin/macros/MonthCalendar.py
index 72141bd41..887d14dee 100644
--- a/src/moin/macros/MonthCalendar.py
+++ b/src/moin/macros/MonthCalendar.py
@@ -3,20 +3,20 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - MonthCalendar Macro
+MoinMoin - MonthCalendar macro.
 
-MonthCalendar - generates a Calendar.
+MonthCalendar generates a calendar.
 
-You can use this macro to put a month's calendar page on a Wiki page.
+You can use this macro to put a month’s calendar on a wiki page.
 
-The days are links to Wiki pages following this naming convention:
+The days are links to wiki pages following this naming convention:
 BasePageName/year-month-day
 
 Parameters:
 
     <<MonthCalendar(item,year,month,month_offset,fixed_height,anniversary)>>
 
-    each parameter can be empty and then defaults to currentpage or currentdate or monthoffset=0
+    Each parameter can be empty; defaults apply (current page, current date, or month_offset=0).
     item: str, the base page for calendar events,
           every day in the calendar will link to 'BasePage/yyyy-mm-dd'
           (or 'BasePage/mm-dd' respectively, if anniversary is set)
@@ -54,17 +54,17 @@
     Calendar of next month:
     <<MonthCalendar(month_offset=+1)>>
 
-    Calendar of Page SampleUser, this year's december:
+    Calendar of Page SampleUser, this year's December:
     <<MonthCalendar(item="SampleUser",month=12)>>
 
-    Calendar of current Page, this year's december:
+    Calendar of the current page, this year's December:
     <<MonthCalendar(month=12)>>
 
     Calendar of December, 2022:
     <<MonthCalendar(year=2022,month=12)>>
 
     Calendar of the month two months after December, 2022
-    (maybe doesn't make much sense, but is possible)
+    (maybe this doesn't make much sense, but it is possible)
     <<MonthCalendar(year=2022,month=12,month_offset=+2)>>
 
     Calendar of year 2023 (every month padded to height of 6):
diff --git a/src/moin/macros/PageTitle.py b/src/moin/macros/PageTitle.py
index f6b5b6439..6dbdc6f21 100644
--- a/src/moin/macros/PageTitle.py
+++ b/src/moin/macros/PageTitle.py
@@ -2,9 +2,10 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Create a H1 look-alike that will not be included in TableOfContents.
+Create an H1 look-alike that will not be included in the table of contents.
 
-<<PageTitle(My Page Title)>>
+Usage:
+    <<PageTitle(My Page Title)>>
 """
 
 from moin.utils.tree import html
diff --git a/src/moin/macros/RandomItem.py b/src/moin/macros/RandomItem.py
index b6c18196f..a552829f5 100644
--- a/src/moin/macros/RandomItem.py
+++ b/src/moin/macros/RandomItem.py
@@ -4,9 +4,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - RandomItem Macro displays one or multiple random item links.
+MoinMoin - RandomItem macro displays one or multiple random item links.
 
-TODO: add mimetype param and only show items matching this mimetype
+TODO: Add a mimetype parameter and only show items matching this mimetype.
 """
 
 import random
@@ -29,8 +29,8 @@ def macro(self, content, arguments, page_url, alternative):
 
         all_item_names = get_item_names()
 
-        # Now select random item from the full list, and if it exists and
-        # we can read it, save.
+        # Now select random items from the full list, and if one exists and
+        # we can read it, save it.
         random_item_names = []
         found = 0
         while found < item_count and all_item_names:
@@ -57,5 +57,5 @@ def macro(self, content, arguments, page_url, alternative):
             result.append(moin_page.a(attrib={xlink.href: link}, children=[name]))
             result.append(", ")
 
-        del result[-1]  # kill last comma
+        del result[-1]  # Remove the trailing comma
         return result
diff --git a/src/moin/macros/RandomQuote.py b/src/moin/macros/RandomQuote.py
index 5f0f3917b..3087c5615 100644
--- a/src/moin/macros/RandomQuote.py
+++ b/src/moin/macros/RandomQuote.py
@@ -4,14 +4,14 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - RandomQuote Macro selects a random quote from FortuneCookies or a given moinwiki item.
+MoinMoin - RandomQuote macro selects a random quote from FortuneCookies or a given wiki item.
 
     Usage:
         <<RandomQuote()>>
         <<RandomQuote(WikiTips)>>
 
     Comments:
-        It will look for list delimiters on the moinwiki item in question.
+        It will look for list delimiters in the item in question.
         It will ignore anything that is not in an "*" list.
 """
 
diff --git a/src/moin/macros/ShowIcons.py b/src/moin/macros/ShowIcons.py
index 3395a812a..dde89a813 100644
--- a/src/moin/macros/ShowIcons.py
+++ b/src/moin/macros/ShowIcons.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Show all available icons that may be included in wiki item content
+Show all available icons that may be included in wiki item content,
 using the Icon macro:
 
     <<Icon(myicon.png)>>
diff --git a/src/moin/macros/ShowSmileys.py b/src/moin/macros/ShowSmileys.py
index 429fd3cf3..220a360bb 100644
--- a/src/moin/macros/ShowSmileys.py
+++ b/src/moin/macros/ShowSmileys.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Show all available smileys that may be included in wiki item content
+Show all available smileys that may be included in wiki item content.
 """
 
 from flask import url_for
diff --git a/src/moin/macros/ShowUserGroup.py b/src/moin/macros/ShowUserGroup.py
index da9de4601..29ea9dc5a 100644
--- a/src/moin/macros/ShowUserGroup.py
+++ b/src/moin/macros/ShowUserGroup.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Show contents of UserGroup attribute in metadata.
+Show the contents of the UserGroup attribute in metadata.
 """
 
 from moin.macros._base import MacroBlockBase, fail_message
@@ -18,5 +18,5 @@ def macro(self, content, arguments, page_url, alternative):
             item = Item.create(url)
             return item.meta[USERGROUP]
         except KeyError:
-            msg = _('ShowUserGroup macro failed - metadata lacks "usergroup" attribute.')
-            return fail_message(msg)
+            msg = _('ShowUserGroup macro failed: metadata lacks "usergroup" attribute.')
+            return fail_message(msg, alternative)
diff --git a/src/moin/macros/ShowWikiDict.py b/src/moin/macros/ShowWikiDict.py
index 0ab9a3899..d269bdf48 100644
--- a/src/moin/macros/ShowWikiDict.py
+++ b/src/moin/macros/ShowWikiDict.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Show contents of WikiDict attribute in metadata.
+Show the contents of the WikiDict attribute in metadata.
 """
 
 from moin.macros._base import MacroBlockBase, fail_message
@@ -18,5 +18,5 @@ def macro(self, content, arguments, page_url, alternative):
             item = Item.create(url)
             return item.meta[WIKIDICT]
         except KeyError:
-            msg = _('ShowWikiDict macro failed - metadata lacks "wikidict" attribute.')
-            return fail_message(msg)
+            msg = _('ShowWikiDict macro failed: metadata lacks "wikidict" attribute.')
+            return fail_message(msg, alternative)
diff --git a/src/moin/macros/SlideShow.py b/src/moin/macros/SlideShow.py
index 64285decd..c458a2741 100644
--- a/src/moin/macros/SlideShow.py
+++ b/src/moin/macros/SlideShow.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Create link to start a SlideShow for the current item
+Create a link to start a slide show for the current item.
 """
 
 from flask import url_for
@@ -14,7 +14,8 @@
 class Macro(MacroInlineBase):
     def macro(self, content, arguments, page_url, alternative):
         attrib = {moin_page.class_: "fa-regular fa-circle-play"}
-        children = [moin_page.span(attrib=attrib), _(" Start SlideShow")]
+        # Visible label for the slide show link
+        children = [moin_page.span(attrib=attrib), _(" Start Slide Show")]
         url = url_for("frontend.slide_item", item_name=page_url.path[1:])
         result = moin_page.a(attrib={xlink.href: url, moin_page.class_: "moin-no-print"}, children=children)
         return result
diff --git a/src/moin/macros/TitleIndex.py b/src/moin/macros/TitleIndex.py
index 864392dd8..1b8c3c88c 100644
--- a/src/moin/macros/TitleIndex.py
+++ b/src/moin/macros/TitleIndex.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-TitleIndex - generates a list of links for the namespace of the current item, grouped by initials
+TitleIndex - generates a list of links for the namespace of the current item, grouped by initials.
 
 Parameters:
     None
@@ -19,17 +19,17 @@
 
 class Macro(MacroMultiLinkListBase):
     def macro(self, content, arguments, page_url, alternative):
-        # get namespace of current item
+        # Get namespace of current item.
         namespace = split_fqname(str(page_url.path)).namespace
 
         if arguments:
-            err_msg = _("TitleList macro does not support any arguments.")
+            err_msg = _("TitleIndex macro does not support any arguments.")
             return fail_message(err_msg, alternative)
 
         children = get_item_names(namespace)
         if not children:
             empty_list = moin_page.list(attrib={moin_page.item_label_generate: "unordered"})
-            item_body = moin_page.list_item_body(children=[_("<TitleList macro: No matching items were found.>")])
+            item_body = moin_page.list_item_body(children=[_("<TitleIndex macro: No matching items were found.>")])
             empty_list.append(moin_page.list_item(children=[item_body]))
             return empty_list
 
diff --git a/src/moin/macros/Verbatim.py b/src/moin/macros/Verbatim.py
index 445eecf90..b33095fa7 100644
--- a/src/moin/macros/Verbatim.py
+++ b/src/moin/macros/Verbatim.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Output the input text as is: <<Verbatim(return `same` __text__ '''as''' entered)>>
+Outputs the input text as is: <<Verbatim(return `same` __text__ '''as''' entered)>>
 """
 
 
diff --git a/src/moin/macros/__init__.py b/src/moin/macros/__init__.py
index 8f7681c7e..58ca08640 100644
--- a/src/moin/macros/__init__.py
+++ b/src/moin/macros/__init__.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - New style macros
+MoinMoin - new-style macros.
 
 Macros are used to implement complex and/or dynamic page content.
 
diff --git a/src/moin/macros/_base.py b/src/moin/macros/_base.py
index e271e7f25..59646c013 100644
--- a/src/moin/macros/_base.py
+++ b/src/moin/macros/_base.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Macro base class
+MoinMoin - macro base classes and utilities for macros.
 """
 
 import re
@@ -73,7 +73,7 @@ def get_item_names(name="", startswith="", kind="files", skiptag="", tag="", reg
 
 
 def valid_item_name(name):
-    """return False if item_name not valid"""
+    """Return False if the item name is not valid."""
     if not isinstance(name, str):
         return False
     if name != name.strip():
@@ -89,7 +89,7 @@ def valid_item_name(name):
 
 def extract_h1(item_name):
     """
-    Return the first heading found in the item's content
+    Return the first heading found in the item's content.
     """
     item = Item.create(item_name, rev_id=CURRENT)
     contenttype = item.meta[CONTENTTYPE]
@@ -112,10 +112,10 @@ def fail_message(msg, alternative, severity="error"):
     """
     Return an error message in admonition-like format.
 
-    :param msg: error message
-    :param alternative: full text of macro as passed in MacroBase __call__
-    :param Severity: attention, caution, danger, error, hint, important, note, or tip
-    :returns: formatted text of macro, error message
+    :param msg: Error message.
+    :param alternative: Full text of the macro as passed to MacroBase.__call__.
+    :param severity: One of: attention, caution, danger, error, hint, important, note, or tip.
+    :return: Formatted HTML node containing the macro text and error message.
     """
     if severity not in "attention caution danger error hint important note tip".split():
         raise ValueError
diff --git a/src/moin/macros/_tests/test_Anchor.py b/src/moin/macros/_tests/test_Anchor.py
index 56f1d2353..a87d570f4 100644
--- a/src/moin/macros/_tests/test_Anchor.py
+++ b/src/moin/macros/_tests/test_Anchor.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Test for macros.Anchor
+MoinMoin - tests for moin.macros.Anchor.
 """
 
 from moin.macros.Anchor import Macro
@@ -10,16 +10,17 @@
 
 
 def test_Macro():
+    """Test Macro.macro."""
     macro_obj = Macro()
     arguments = ["my_anchor"]
     result = macro_obj.macro("content", arguments, "page_url", "alternative")
     test_anchor = list(result.attrib.values())
-    # test_anchor[0] since it returns a list
+    # test_anchor[0] is used because it returns a list.
     assert test_anchor[0] == arguments[0]
     assert result.attrib[moin_page.id] == "my_anchor"
 
     arguments = []
     result = macro_obj.macro("content", arguments, "page_url", "alternative")
     test_anchor = list(result.attrib.values())
-    # expecting error message with class of 'error nowiki'
+    # Expect an error message with class 'error nowiki'.
     assert "error" in test_anchor[0]
diff --git a/src/moin/macros/_tests/test_Date.py b/src/moin/macros/_tests/test_Date.py
index a78dd56c1..feffa865e 100644
--- a/src/moin/macros/_tests/test_Date.py
+++ b/src/moin/macros/_tests/test_Date.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Test for macros.Date
+MoinMoin - tests for moin.macros.Date.
 """
 
 import time
@@ -30,11 +30,14 @@ def test_parse_time(self):
 
         flaskg.user.valid = True  # show_time creates ISO 8601 dates if user is not logged in
         result = format_date_time(utcfromtimestamp(ts))
-        expected = ["Aug 7, 2023, 5:38:11\u202fAM", "Aug 7, 2023, 5:38:11 AM"]  # TODO: remove 2nd entry later
+        expected = [
+            "Aug 7, 2023, 5:38:11\u202fAM",
+            "Aug 7, 2023, 5:38:11 AM",
+        ]  # TODO: The second entry can be removed later
         assert result in expected
 
         with pytest.raises(ValueError):
-            # things after next 10,000 years can't be predicted
+            # Dates beyond the next 10,000 years can't be predicted.
             MacroDateTimeBase_obj.parse_time("12011-08-07T11:11:11")
 
 
@@ -46,7 +49,7 @@ def test_macro(self):
         flaskg.user.iso_8601 = False
 
         macro_obj = Macro()
-        # when arguments is None
+        # When arguments is None
         result = macro_obj.macro("content", None, "page_url", "alternative")
         test_time = time.time()
         test_time = format_date(utcfromtimestamp(test_time))
diff --git a/src/moin/macros/_tests/test_DateTime.py b/src/moin/macros/_tests/test_DateTime.py
index f0bbfe0b1..0d79cff51 100644
--- a/src/moin/macros/_tests/test_DateTime.py
+++ b/src/moin/macros/_tests/test_DateTime.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Test for macros.DateTime
+MoinMoin - tests for moin.macros.DateTime.
 """
 
 import time
@@ -16,12 +16,12 @@
 
 
 def test_Macro():
-    """Test: DateTime.Macro"""
+    """Test Macro.macro."""
     flaskg.user.valid = True  # show_time creates ISO 8601 dates if user is not logged in
     macro_obj = Macro()
-    # when arguments is None
+    # When arguments is None
     result = macro_obj.macro("content", None, "page_url", "alternative")
-    # get the current time
+    # Get the current time
     test_time = time.time()
     test_times = [test_time, test_time - 1]  # in case our call to time.time happened just after the second rolled over
     test_times = [format_date_time(utcfromtimestamp(t)) for t in test_times]
@@ -29,7 +29,10 @@ def test_Macro():
 
     arguments = ["2023-08-07T11:11:11", "argument2"]
     result = macro_obj.macro("content", arguments, "page_url", "alternative")
-    expected = ["Aug 7, 2023, 11:11:11\u202fAM", "Aug 7, 2023, 11:11:11 AM"]  # TODO: remove 2nd entry later
+    expected = [
+        "Aug 7, 2023, 11:11:11\u202fAM",
+        "Aug 7, 2023, 11:11:11 AM",
+    ]  # TODO: The second entry can be removed in the future
     assert result in expected
 
     flaskg.user.valid = False
@@ -40,16 +43,16 @@ def test_Macro():
     arguments = ["incorrect_argument"]
     result = macro_obj.macro("content", arguments, "page_url", "alternative")
     attr = list(result.attrib.values())
-    # expecting error message with class of 'error nowiki'
+    # Expect an error message with class 'error nowiki'.
     assert "error" in attr[0]
 
-    # the following are different ways to specify the same moment
+    # The following are different ways to specify the same moment.
     expected = "2019-10-07 18:30:00z"
     arguments = [
         "2019-10-07T18:30:00Z" "2019-10-07T22:30:00+0400",
-        "2019-10-07 11:30:00-0700",  # ascii hyphen-minus
+        "2019-10-07 11:30:00-0700",  # ASCII hyphen-minus
         "2019-10-07T15:00:00-0330",
-        "2019-10-07 11:30:00\u22120700",  # unicode minus \u2212
+        "2019-10-07 11:30:00\u22120700",  # Unicode minus \u2212
         "2019-10-07T15:00:00\u22120330",
     ]
     for arg in arguments:
diff --git a/src/moin/macros/_tests/test_GetText.py b/src/moin/macros/_tests/test_GetText.py
index 6e451c017..d6539fbe2 100644
--- a/src/moin/macros/_tests/test_GetText.py
+++ b/src/moin/macros/_tests/test_GetText.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Test for macros.GetText
+MoinMoin - tests for moin.macros.GetText.
 """
 
 from moin.converters._args import Arguments
@@ -10,7 +10,7 @@
 
 
 def test_Macro():
-    """test for Macro.macros"""
+    """Test Macro.macro."""
     macro_obj = Macro()
     arguments = Arguments(["test_argument1 test_argument2"])
     result = macro_obj.macro("content", arguments, "page_url", "alternative")
diff --git a/src/moin/macros/_tests/test_GetVal.py b/src/moin/macros/_tests/test_GetVal.py
index cd32362ea..22c1bad72 100644
--- a/src/moin/macros/_tests/test_GetVal.py
+++ b/src/moin/macros/_tests/test_GetVal.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Test for macros.GetVal
+MoinMoin - tests for moin.macros.GetVal.
 """
 
 import pytest
@@ -23,11 +23,12 @@ def test_dict(self):
         return "TestDict"
 
     def test_Macro(self, test_dict):
+        """Test Macro.macro."""
         macro_obj = Macro()
         arguments = [test_dict]
         result = macro_obj.macro("content", arguments, "page_url", "alternative")
         attr = list(result.attrib.values())
-        # expecting error message with class of 'error nowiki'
+        # Expect an error message with class 'error nowiki'
         assert "error" in attr[0]
 
         if not flaskg.user.may.read(arguments[0]):
@@ -38,7 +39,7 @@ def test_Macro(self, test_dict):
         result = macro_obj.macro("content", arguments, "page_url", "alternative")
         assert result == "1"
 
-        # change the value of second element
+        # Change the value of the second element
         arguments = ["TestDict, Two"]
         result = macro_obj.macro("content", arguments, "page_url", "alternative")
         assert result == "2"
diff --git a/src/moin/macros/_tests/test_ItemList.py b/src/moin/macros/_tests/test_ItemList.py
index 2d94f33c0..9d20e01c8 100644
--- a/src/moin/macros/_tests/test_ItemList.py
+++ b/src/moin/macros/_tests/test_ItemList.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.macros.ItemList Tests
+MoinMoin - tests for moin.macros.ItemList.
 """
 
 from moin.items import Item
@@ -14,12 +14,12 @@
 
 class TestItemListMacro:
     """
-    call ItemList macro and test ...
+    Call the ItemList macro and test the output.
     """
 
     class Config(wikiconfig.Config):
         """
-        we just have this so the test framework creates a new app with empty backends for us.
+        Provide a fresh app with empty backends for these tests.
         """
 
     def test_ItemListFullPath(self):
diff --git a/src/moin/macros/_tests/test_MonthCalendar.py b/src/moin/macros/_tests/test_MonthCalendar.py
index 0270f5f53..9aeda551e 100644
--- a/src/moin/macros/_tests/test_MonthCalendar.py
+++ b/src/moin/macros/_tests/test_MonthCalendar.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.macros.MonthCalendar Tests
+MoinMoin - tests for moin.macros.MonthCalendar.
 """
 
 from emeraldtree.tree import Element
@@ -13,7 +13,7 @@
 
 def test_parseargs_one():
     """
-    checking the handling of explicit and default parameters in parseargs
+    Check handling of explicit and default parameters in parseargs.
     """
     args = parseargs(
         'item="TEST-CALENDAR",month_offset=-1,fixed_height=true',  # macro arguments
@@ -43,7 +43,7 @@ def test_parseargs_two():
 
 def test_Macro():
     """
-    call MonthCalendar macro and test some attributes of resulting table
+    Call the MonthCalendar macro and test some attributes of the resulting table.
     """
     macro_obj = Macro()
     arguments = Element("arguments")
@@ -62,7 +62,7 @@ def test_Macro():
 
     # the last macro parameter forces six rows in the calendar output
     # even though some month will only need five week rows
-    assert len(result_tags[2]) == 6  # number table rows
+    assert len(result_tags[2]) == 6  # number of table rows
 
 
 @pytest.mark.parametrize(
diff --git a/src/moin/macros/_tests/test_ShowIcons.py b/src/moin/macros/_tests/test_ShowIcons.py
index 3f27aa2d6..396308a8e 100644
--- a/src/moin/macros/_tests/test_ShowIcons.py
+++ b/src/moin/macros/_tests/test_ShowIcons.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Test for macros.ShowIcons
+MoinMoin - tests for moin.macros.ShowIcons.
 """
 
 import re
@@ -13,7 +13,7 @@
 
 
 def test_ShowIconsMacro():
-    """Call ShowIcons macro and test output"""
+    """Call the ShowIcons macro and test the output."""
     test_icons = ["admon-note", "angry", "biggrin", "frown", "moin-rss", "smile3", "star_off"]
     expected_namespace = "{http://moinmo.in/namespaces/page}"
     expected_tags = set(f"{expected_namespace}{el_name}" for el_name in ["table", "table-header", "table-row"])
@@ -37,7 +37,7 @@ def test_ShowIconsMacro():
 
 
 def get_css_icon_names():
-    """Read css file and search for icon urls"""
+    """Read CSS file and search for icon URLs."""
     css_file = os.path.join(os.path.split(my_dir)[0], "..", "static", "css", "common.css")
     with open(css_file, encoding="utf-8") as f:
         common_css = f.readlines()
@@ -50,7 +50,7 @@ def get_css_icon_names():
 
 
 def get_icon_filenames():
-    """Scan img/icons dir for filenames"""
+    """Scan the img/icons directory for filenames."""
     icon_dir = os.path.join(os.path.split(my_dir)[0], "..", "static", "img", "icons")
     filenames = set()
     with os.scandir(icon_dir) as files:
@@ -61,7 +61,7 @@ def get_icon_filenames():
 
 
 def test_all_icon_files_exist():
-    """Test if icons from css urls is a subset of filenames in icon dir"""
+    """Test that icons from CSS URLs are a subset of filenames in the icon directory."""
     icons = get_css_icon_names()
     files = get_icon_filenames()
     missing_icons = list(icons - files)
diff --git a/src/moin/macros/_tests/test_ShowSmileys.py b/src/moin/macros/_tests/test_ShowSmileys.py
index 450c0f98a..25281abd5 100644
--- a/src/moin/macros/_tests/test_ShowSmileys.py
+++ b/src/moin/macros/_tests/test_ShowSmileys.py
@@ -2,14 +2,14 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Test for macros.ShowSmileys
+MoinMoin - tests for moin.macros.ShowSmileys.
 """
 
 from moin.macros.ShowSmileys import Macro
 
 
 def test_Macro():
-    """test for Macro.macro"""
+    """Test Macro.macro."""
     expected_text = ["X-(", "angry", ":D", "biggrin", "<:(", "frown", "{o}", "star_off"]
     expected_tag = "{http://moinmo.in/namespaces/page}table-row"
     macro_obj = Macro()
diff --git a/src/moin/macros/_tests/test_Verbatim.py b/src/moin/macros/_tests/test_Verbatim.py
index 53f8039a1..4a69a3d0e 100644
--- a/src/moin/macros/_tests/test_Verbatim.py
+++ b/src/moin/macros/_tests/test_Verbatim.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Test for macros.Verbatim
+MoinMoin - tests for moin.macros.Verbatim.
 """
 
 from moin.macros.Verbatim import Macro
diff --git a/src/moin/macros/_tests/test__base.py b/src/moin/macros/_tests/test__base.py
index 1b28fff84..8783f5c51 100644
--- a/src/moin/macros/_tests/test__base.py
+++ b/src/moin/macros/_tests/test__base.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.macros._base
+MoinMoin - tests for moin.macros._base.
 """
 
 import pytest
@@ -12,20 +12,20 @@
 
 
 class TestMacroBase:
-    """Test for Macro base and related classes"""
+    """Tests for macro base and related classes."""
 
     def test_MacroBase(self):
-        """test for MacroBase class"""
+        """Test MacroBase class."""
         macrobase_obj = MacroBase()
         assert not macrobase_obj.immutable
         with pytest.raises(NotImplementedError):
             macrobase_obj.__call__("content", "arguments", "page_url", "alternative", "context_block")
 
     def test_MacroBlockBase(self):
-        """test for MacroBlockBase class"""
+        """Test MacroBlockBase class."""
 
         class Test_MacroBlockBase(MacroBlockBase):
-            """inherited class from MacroBlockBase"""
+            """Subclass of MacroBlockBase."""
 
         macroblockbase_obj = Test_MacroBlockBase()
         result = macroblockbase_obj.__call__("content", "arguments", "page_url", "alternative", context_block=False)
@@ -34,10 +34,10 @@ class Test_MacroBlockBase(MacroBlockBase):
             macroblockbase_obj.__call__("content", "arguments", "page_url", "alternative", "context_block")
 
     def test_MacroInlineBase(self):
-        """test for MacroInlineBase class"""
+        """Test MacroInlineBase class."""
 
         class Test_MacroInlineBase(MacroInlineBase):
-            """inherited class from MacroInlineBase"""
+            """Subclass of MacroInlineBase."""
 
             def macro(self, content, arguments, page_url, alternative):
                 return "test_macro"
@@ -51,10 +51,10 @@ def macro(self, content, arguments, page_url, alternative):
         assert not result.text
 
     def test_MacroInlineOnlyBase(self):
-        """test for MacroInlineOnlyBase class"""
+        """Test MacroInlineOnlyBase class."""
 
         class Test_MacroInlineOnlyBase(MacroInlineOnlyBase):
-            """inherited class from MacroInlineOnlyBase"""
+            """Subclass of MacroInlineOnlyBase."""
 
             def macro(self, content, arguments, page_url, alternative):
                 return "test_macro"
@@ -66,10 +66,10 @@ def macro(self, content, arguments, page_url, alternative):
         assert result == "test_macro"
 
     def test_MacroPageLinkListBase(self):
-        """test for MacroPageLinkListBase class"""
+        """Test MacroPageLinkListBase class."""
 
         class Test_MacroPageLinkListBase(MacroPageLinkListBase):
-            """inherited class from MacroPageLinkListBase"""
+            """Subclass of MacroPageLinkListBase."""
 
             def macro(self, content, arguments, page_url, alternative):
                 return "test_macro"
diff --git a/src/moin/mail/__init__.py b/src/moin/mail/__init__.py
index cd445c5e3..dd9fbe5d3 100644
--- a/src/moin/mail/__init__.py
+++ b/src/moin/mail/__init__.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - Package Initialization
+MoinMoin - package initialization.
 
-    Subpackage containing e-mail support code.
+Subpackage containing e-mail support code.
 """
diff --git a/src/moin/mail/_tests/test_sendmail.py b/src/moin/mail/_tests/test_sendmail.py
index 0671bfea5..1d7d5f1d6 100644
--- a/src/moin/mail/_tests/test_sendmail.py
+++ b/src/moin/mail/_tests/test_sendmail.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.mail.sendmail Tests
+MoinMoin - moin.mail.sendmail tests.
 """
 
 
@@ -10,7 +10,7 @@
 
 
 class TestdecodeSpamSafeEmail:
-    """mail.sendmail: testing mail"""
+    """mail.sendmail: testing decodeSpamSafeEmail."""
 
     _tests = (
         ("", ""),
@@ -29,13 +29,13 @@ class TestdecodeSpamSafeEmail:
     )
 
     def testDecodeSpamSafeMail(self):
-        """mail.sendmail: decoding spam safe mail"""
+        """mail.sendmail: decoding spam-safe email addresses."""
         for coded, expected in self._tests:
             assert sendmail.decodeSpamSafeEmail(coded) == expected
 
 
 class TestencodeSpamSafeEmail:
-    """mail.sendmail: testing spam safe mail"""
+    """mail.sendmail: testing encodeSpamSafeEmail (spam-safe encoding)."""
 
     _tests = (
         ("", ""),
@@ -48,12 +48,12 @@ class TestencodeSpamSafeEmail:
     )
 
     def testEncodeSpamSafeMail(self):
-        """mail.sendmail: encoding mail address to spam safe mail"""
+        """mail.sendmail: encoding email addresses to spam-safe format."""
         for coded, expected in self._tests:
             assert sendmail.encodeSpamSafeEmail(coded) == expected
 
     def testEncodeSpamSafeMailAndObfuscate(self):
-        """mail.sendmail: encoding mail address by an obfuscate string to spam safe mail"""
+        """mail.sendmail: encoding email addresses with an obfuscation string to spam-safe format."""
         for coded, expected in self._tests:
             expected = expected.replace(" AT ", " AT SYCTE ")
             assert sendmail.encodeSpamSafeEmail(coded, "SYCTE") == expected
diff --git a/src/moin/mail/sendmail.py b/src/moin/mail/sendmail.py
index af7210be4..e0978a5aa 100644
--- a/src/moin/mail/sendmail.py
+++ b/src/moin/mail/sendmail.py
@@ -4,7 +4,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - email helper functions
+MoinMoin - Email helper functions.
 """
 
 
@@ -25,7 +25,7 @@
 
 
 def sendmail(subject, text, to=None, cc=None, bcc=None, mail_from=None, html=None):
-    """Create and send a text/plain message
+    """Create and send a text/plain message.
 
     Return a tuple of success or error indicator and message.
 
@@ -41,7 +41,7 @@ def sendmail(subject, text, to=None, cc=None, bcc=None, mail_from=None, html=Non
     :type bcc: list of str
     :param mail_from: override default mail_from
     :type mail_from: str
-    :param html: html email body text
+    :param html: HTML email body text
     :type html: str
 
     :rtype: tuple
diff --git a/src/moin/search/__init__.py b/src/moin/search/__init__.py
index 6cd1aec86..164a612e3 100644
--- a/src/moin/search/__init__.py
+++ b/src/moin/search/__init__.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - MoinMoin search package
+MoinMoin - search package.
 """
 
 from moin.i18n import L_
@@ -13,13 +13,13 @@
 
 
 class ValidSearch(Validator):
-    """Validator for a valid search form"""
+    """Validator for a valid search form."""
 
     too_short_query_msg = L_("Search query too short.")
 
     def validate(self, element, state):
         if element["q"].value is None:
-            # no query, nothing to search for
+            # No query; nothing to search for
             return False
         if len(element["q"].value) < 2:
             return self.note_error(element, state, "too_short_query_msg")
diff --git a/src/moin/search/_tests/test_analyzers.py b/src/moin/search/_tests/test_analyzers.py
index 8e1ea160f..dbea0600e 100644
--- a/src/moin/search/_tests/test_analyzers.py
+++ b/src/moin/search/_tests/test_analyzers.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
- MoinMoin - moin.search.analyzers Tests
+MoinMoin - tests for moin.search.analyzers.
 """
 
 
@@ -14,7 +14,7 @@
 class TokenizerTestBase:
 
     def testTokenizer(self):
-        """analyzers: check what obtained tokens matched given"""
+        """Analyzers: verify that obtained tokens match expected values."""
         tokenizer = self.make_tokenizer()
         for value, expected_tokens in self.test_cases_query:
             tokens = [token.text for token in tokenizer(value)]
@@ -22,7 +22,7 @@ def testTokenizer(self):
 
 
 class TestAclTokenizer(TokenizerTestBase):
-    """analyzers: test ACL tokenizer"""
+    """Analyzers: test ACL tokenizer."""
 
     test_cases_query = [
         # (query, tokens)
@@ -99,7 +99,7 @@ def make_tokenizer(self):
 
 
 class TestMimeTokenizer(TokenizerTestBase):
-    """analyzers: test content type analyzer"""
+    """Analyzers: test content type analyzer."""
 
     test_cases_query = [
         # (query, tokens)
@@ -159,7 +159,7 @@ def make_tokenizer(self):
 
 
 class TestItemNameAnalyzer(TokenizerTestBase):
-    """analyzers: test item_name analyzer"""
+    """Analyzers: test item_name analyzer."""
 
     test_cases_query = [
         # (query, tokens)
@@ -181,7 +181,7 @@ def make_tokenizer(self):
         return item_name_analyzer()
 
     def testTokenizer(self):
-        """analyzers: test item name analyzer with "query" and "index" mode"""
+        """Analyzers: test item name analyzer with 'query' and 'index' modes."""
         tokenizer = self.make_tokenizer()
         for value, expected_tokens in self.test_cases_query:
             tokens = [token.text for token in tokenizer(value, mode="query")]
diff --git a/src/moin/search/analyzers.py b/src/moin/search/analyzers.py
index 0dedee5a2..9fbbc94a2 100644
--- a/src/moin/search/analyzers.py
+++ b/src/moin/search/analyzers.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Misc. tokenizers and analyzers for whoosh indexing
+MoinMoin - miscellaneous tokenizers and analyzers for Whoosh indexing.
 """
 
 from whoosh.analysis import MultiFilter, IntraWordFilter, LowercaseFilter
@@ -12,7 +12,7 @@
 
 
 class MimeTokenizer(Tokenizer):
-    """Content type tokenizer"""
+    """Content type tokenizer."""
 
     def __call__(self, value, start_pos=0, positions=False, mode="", **kwargs):
         """
@@ -29,7 +29,7 @@ def __call__(self, value, start_pos=0, positions=False, mode="", **kwargs):
         Output: "application/pdf", "application", "pdf"
 
         :param value: String for tokenization
-        :mode value: query or index
+        :param mode: query or index
         :param start_pos: The position number of the first token. For example,
             if you set start_pos=2, the tokens will be numbered 2,3,4,...
             instead of 0,1,2,...
@@ -50,7 +50,7 @@ def __call__(self, value, start_pos=0, positions=False, mode="", **kwargs):
             # text/x.moin.wiki;charset=utf-8
             yield tk
             if "/" not in value:
-                # unsupported contenttype
+                # Unsupported content type
                 return
             major, minor = value.split("/")
             # text, x.moin.wiki;charset=utf-8
@@ -74,11 +74,11 @@ def __call__(self, value, start_pos=0, positions=False, mode="", **kwargs):
                     yield tk
                 minor = parameters[0]  # x.moin.wiki
             if minor == "mpeg":
-                # 'audio/mpeg' most people expect mp3
+                # 'audio/mpeg' — most people expect mp3.
                 tk.text = "mp3"
                 yield tk
             if minor == "jpeg":
-                # 'image/jpeg' most people expect jpg
+                # 'image/jpeg' — most people expect jpg.
                 tk.text = "jpg"
                 yield tk
             if minor == "x.moin.wiki":
@@ -109,19 +109,19 @@ def __call__(self, value, start_pos=0, positions=False, mode="", **kwargs):
 
 
 class AclTokenizer(Tokenizer):
-    """Access control list tokenizer"""
+    """Access control list tokenizer."""
 
     def __init__(self, acl_rights_contents):
         """
-        :param acl_rights_contents: ACL for contents
+        :param acl_rights_contents: ACL for contents.
         """
         self._acl_rights_contents = acl_rights_contents
 
     def __call__(self, value, start_pos=0, positions=False, mode="", **kwargs):
         """
-        Calls AccessControlList for tokenization
+        Call AccessControlList for tokenization.
 
-        Analyzer behaviour:
+        Analyzer behavior:
 
         In index mode:
             Input: "JoeDoe,JaneDoe:admin,read,write,destroy +EditorGroup:write All:read"
@@ -165,7 +165,7 @@ def __call__(self, value, start_pos=0, positions=False, mode="", **kwargs):
 
 def item_name_analyzer():
     """
-    Analyzer behaviour:
+    Analyzer behavior:
 
     Input: "some item name", "SomeItem/SubItem", "GSOC2011"
 
diff --git a/src/moin/security/__init__.py b/src/moin/security/__init__.py
index 960566e18..bcd48dc2f 100644
--- a/src/moin/security/__init__.py
+++ b/src/moin/security/__init__.py
@@ -7,7 +7,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Wiki Security Interface and Access Control Lists
+MoinMoin - Wiki security interface and access control lists.
 """
 
 
@@ -25,9 +25,9 @@
 
 def require_permission(permission):
     """
-    view decorator to require a specific permission
+    View decorator to require a specific permission.
 
-    if the permission is not granted, abort with 403
+    If the permission is not granted, abort with 403.
     """
 
     def wrap(f):
diff --git a/src/moin/security/_tests/test_security.py b/src/moin/security/_tests/test_security.py
index 4f2cabc9e..d1ea341c6 100644
--- a/src/moin/security/_tests/test_security.py
+++ b/src/moin/security/_tests/test_security.py
@@ -4,7 +4,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.security Tests
+MoinMoin - moin.security tests.
 """
 
 
@@ -23,7 +23,7 @@
 
 def acliter(acl):
     """
-    return a acl string iterator (using cfg.acl_rights_contents as valid acl rights)
+    Return an ACL string iterator (using cfg.acl_rights_contents as valid ACL rights).
     """
     return ACLStringIterator(app.cfg.acl_rights_contents, acl)
 
diff --git a/src/moin/signalling/__init__.py b/src/moin/signalling/__init__.py
index ee5d11ef8..94a2f72ef 100644
--- a/src/moin/signalling/__init__.py
+++ b/src/moin/signalling/__init__.py
@@ -2,10 +2,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - signalling support
+    MoinMoin - signalling support.
 
-    MoinMoin uses blinker for sending signals and letting listeners subscribe
-    to signals.
+    MoinMoin uses Blinker to send signals and let listeners subscribe to them.
 """
 
 
diff --git a/src/moin/signalling/log.py b/src/moin/signalling/log.py
index bacc14082..a6c7ac2c6 100644
--- a/src/moin/signalling/log.py
+++ b/src/moin/signalling/log.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - logging signal handlers
+    MoinMoin - logging signal handlers.
 """
 
 
diff --git a/src/moin/signalling/signals.py b/src/moin/signalling/signals.py
index 1dfcec964..524ef5d22 100644
--- a/src/moin/signalling/signals.py
+++ b/src/moin/signalling/signals.py
@@ -2,9 +2,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - signals
+MoinMoin - signals
 
-    We define all signals here to avoid typos/conflicts in the signal name.
+Define all signals here to avoid typos/conflicts in signal names.
 """
 
 
diff --git a/src/moin/storage/__init__.py b/src/moin/storage/__init__.py
index 0ae959e54..a15f73083 100644
--- a/src/moin/storage/__init__.py
+++ b/src/moin/storage/__init__.py
@@ -43,11 +43,11 @@
 
 def backend_from_uri(uri: str):
     """
-    create a backend instance for uri
+    Create a backend instance for a URI.
     """
     backend_name_uri = uri.split(":", 1)
     if len(backend_name_uri) != 2:
-        raise ValueError(f"malformed backend uri: {uri}")
+        raise ValueError(f"malformed backend URI: {uri}")
     backend_name, backend_uri = backend_name_uri
     module = __import__(BACKENDS_PACKAGE + "." + backend_name, globals(), locals(), ["MutableBackend"])
     return module.MutableBackend.from_uri(backend_uri)
@@ -59,7 +59,7 @@ def create_mapping(uri: str, namespaces: dict[str, str], backends: dict[str, str
         (backend_name, backend_from_uri((backends[backend_name] or uri) % dict(backend=backend_name, kind="%(kind)s")))
         for backend_name in backends
     ]
-    # we need the longest mountpoints first, shortest last (-> '' is very last)
+    # We need the longest mount points first, shortest last (-> '' is very last)
     namespace_mapping = sorted(namespaces.items(), key=lambda x: len(x[0]), reverse=True)
     acl_mapping = sorted(acls.items(), key=lambda x: len(x[0]), reverse=True)
     return namespace_mapping, dict(backend_mapping), acl_mapping
@@ -77,14 +77,14 @@ def create_simple_mapping(
     When configuring storage, the admin needs to provide a namespace_mapping.
     To ease creation of such a mapping, this function provides sane defaults
     for different types of stores.
-    The admin can just call this function, pass a hint on what type of stores
-    he wants to use and a proper mapping is returned.
-
-    :params uri: '<backend_name>:<backend_uri>' (general form)
-                 backend_name must be a backend module name (e.g. stores)
-                 the backend_uri must have a %(backend)s placeholder, it gets replaced
-                 by the name of the backend (a simple, ascii string) and result
-                 is given to to that backend's constructor
+    The admin can call this function, pass a hint about the store type
+    they want to use, and a proper mapping is returned.
+
+    :param uri: '<backend_name>:<backend_uri>' (general form)
+                backend_name must be a backend module name (e.g., stores)
+                the backend_uri must have a %(backend)s placeholder; it gets replaced
+                by the name of the backend (a simple, ASCII string) and the result
+                is given to that backend's constructor
 
                  for the 'stores' backend, backend_uri looks like '<store_name>:<store_uri>'
                  store_name must be a store module name (e.g. fs)
diff --git a/src/moin/storage/backends/__init__.py b/src/moin/storage/backends/__init__.py
index 066a8b5b3..bb52c607b 100644
--- a/src/moin/storage/backends/__init__.py
+++ b/src/moin/storage/backends/__init__.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - backend base classes
+MoinMoin - backend base classes.
 """
 
 from abc import abstractmethod, ABCMeta
@@ -11,66 +11,66 @@
 
 class BackendBase(metaclass=ABCMeta):
     """
-    ties together a store for metadata and a store for data, readonly
+    Tie together a store for metadata and a store for data, read-only.
     """
 
     @classmethod
     @abstractmethod
     def from_uri(cls, uri):
         """
-        create an instance using the data given in uri
+        Create an instance using the data given in the URI.
         """
 
     @abstractmethod
     def open(self):
         """
-        open the backend, allocate resources
+        Open the backend; allocate resources.
         """
 
     @abstractmethod
     def close(self):
         """
-        close the backend, free resources (except the stored meta/data!)
+        Close the backend; free resources (except the stored meta/data!).
         """
 
     @abstractmethod
     def __iter__(self):
         """
-        iterate over metaids
+        Iterate over meta IDs.
         """
 
     @abstractmethod
     def retrieve(self, metaid):
         """
-        return meta, data related to metaid
+        Return meta and data related to metaid.
         """
 
 
 class MutableBackendBase(BackendBase):
     """
-    same as Backend, but read/write
+    Same as Backend, but read/write.
     """
 
     @abstractmethod
     def create(self):
         """
-        create the backend
+        Create the backend.
         """
 
     @abstractmethod
     def destroy(self):
         """
-        destroy the backend, erase all meta/data it contains
+        Destroy the backend; erase all meta/data it contains.
         """
 
     @abstractmethod
     def store(self, meta, data):
         """
-        store meta, data into the backend, return the metaid
+        Store meta and data into the backend; return the metaid.
         """
 
     @abstractmethod
     def remove(self, metaid, destroy_data=False):
         """
-        delete meta, data related to metaid from the backend
+        Delete meta and data related to metaid from the backend.
         """
diff --git a/src/moin/storage/backends/_tests/__init__.py b/src/moin/storage/backends/_tests/__init__.py
index cc738bc5a..34d01ac51 100644
--- a/src/moin/storage/backends/_tests/__init__.py
+++ b/src/moin/storage/backends/_tests/__init__.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - backend tests
+MoinMoin - backend tests.
 """
 
 from io import BytesIO
@@ -15,13 +15,13 @@
 class BackendTestBase:
     def setup_method(self, method):
         """
-        self.be needs to be an opened backend
+        self.be needs to be an opened backend.
         """
         raise NotImplementedError
 
     def teardown_method(self, method):
         """
-        close self.be
+        Close self.be.
         """
         self.be.close()
 
@@ -36,13 +36,13 @@ def test_iter(self):
 class MutableBackendTestBase(BackendTestBase):
     def setup_method(self, method):
         """
-        self.be needs to be an created/opened backend
+        self.be needs to be a created and opened backend.
         """
         raise NotImplementedError
 
     def teardown_method(self, method):
         """
-        close and destroy self.be
+        Close and destroy self.be.
         """
         self.be.close()
         self.be.destroy()
@@ -117,7 +117,7 @@ def test_iter(self):
         expected_result = set()
         for m, d in mds:
             k = self.be.store(m, BytesIO(d))
-            # note: store_revision injects some new keys (like dataid, metaid, size, hash key) into m
+            # Note: the store operation injects some new keys (like dataid, metaid, size, hash key) into m
             m = tuple(sorted(m.items()))
             expected_result.add((k, m, d))
         result = set()
diff --git a/src/moin/storage/backends/_tests/test_fileserver.py b/src/moin/storage/backends/_tests/test_fileserver.py
index cb9f8dd1b..4462d65c1 100644
--- a/src/moin/storage/backends/_tests/test_fileserver.py
+++ b/src/moin/storage/backends/_tests/test_fileserver.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - fileserver backend tests
+MoinMoin - fileserver backend tests.
 """
 
 import os
@@ -36,18 +36,18 @@ def _prepare(self, items):
         return expected_result
 
     def test_iter(self):
-        # for the fileserver store, even if the directory is empty,
+        # For the fileserver store, even if the directory is empty,
         # we will get a revid for the root directory:
         contents = list(self.be)
         assert len(contents) == 1
         root_revid = contents[0]
-        # revids are like relpath.mtime
+        # Revids are like relpath.mtime
         relpath, mtime = root_revid.split(".")
         assert relpath == ""
 
     def test_files(self):
-        # note: as we can only store the data into the file system, meta can
-        # only have items that are generated by the fileserver backend:
+        # Note: Because we can only store data in the file system, meta can
+        # contain only items generated by the fileserver backend:
         items = [  # name,  meta,   data
             ("foo.png", dict(size=11, contenttype="image/png"), b"png content"),
             ("bar.txt", dict(size=12, contenttype="text/plain"), b"text content"),
@@ -66,7 +66,7 @@ def test_files(self):
         result = set()
         for i in self.be:
             meta, data = self.be.retrieve(i)
-            # we don't want to check some meta values
+            # We do not want to check some meta values
             del meta[MTIME]
             del meta[HASH_ALGORITHM]
             del meta[ITEMID]
@@ -77,8 +77,8 @@ def test_files(self):
         assert result == expected_result
 
     def test_dir(self):
-        # note: as we can only store the data into the file system, meta can
-        # only have items that are generated by the fileserver backend:
+        # Note: Because we can only store data in the file system, meta can
+        # contain only items generated by the fileserver backend:
         items = [  # name,  meta,   data
             ("dir/foo.png", dict(size=11, contenttype="image/png"), b"png content"),
             ("dir/bar.txt", dict(size=12, contenttype="text/plain"), b"text content"),
@@ -106,7 +106,7 @@ def test_dir(self):
         result = set()
         for i in self.be:
             meta, data = self.be.retrieve(i)
-            # we don't want to check some meta values
+            # We do not want to check some meta values
             del meta[MTIME]
             del meta[HASH_ALGORITHM]
             del meta[ITEMID]
diff --git a/src/moin/storage/backends/_tests/test_stores.py b/src/moin/storage/backends/_tests/test_stores.py
index d38f2153d..3d3c10923 100644
--- a/src/moin/storage/backends/_tests/test_stores.py
+++ b/src/moin/storage/backends/_tests/test_stores.py
@@ -2,10 +2,10 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - stores backend tests
+MoinMoin - stores backend tests.
 
-Note: theoretically, it should be enough to test with one kind of store,
-      but we better test with a fs AND a memory store.
+Note: Theoretically, testing one kind of store would be enough, but we test with
+both a file system store and a memory store.
 """
 
 import os
diff --git a/src/moin/storage/backends/_util.py b/src/moin/storage/backends/_util.py
index 6b5012fd2..7f6095d77 100644
--- a/src/moin/storage/backends/_util.py
+++ b/src/moin/storage/backends/_util.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - backend utilities
+MoinMoin - backend utilities.
 """
 
 import hashlib
@@ -11,11 +11,12 @@
 
 class TrackingFileWrapper:
     """
-    Wraps a file and computes hashcode and file size while it is read.
-    Requires that initially the realfile is open and at pos 0.
-    Users need to call .read(blocksize) until it does not return any more data.
-    After this self.hash and self.size will have the wanted values.
-    self.hash is the hash instance, you may want to call self.hash.hexdigest().
+    Wrap a file and compute a hash and file size as it is read.
+
+    The underlying file must be open and positioned at 0 initially.
+    Call read(blocksize) repeatedly until it returns no more data.
+    After that, the size and hash properties are available.
+    The hash property is the hash instance; call hash.hexdigest() if needed.
     """
 
     def __init__(self, realfile, hash_method="sha1"):
@@ -27,7 +28,7 @@ def __init__(self, realfile, hash_method="sha1"):
         if hasattr(realfile, "tell"):
             fpos = realfile.tell()
             if fpos:
-                raise ValueError("file needs to be at pos 0")
+                raise ValueError("file must be at position 0")
 
     def read(self, size=-1):
         data = self._read(size)
@@ -40,11 +41,11 @@ def read(self, size=-1):
     @property
     def size(self):
         if not self._finished:
-            raise AttributeError("do not access size attribute before having read all data")
+            raise AttributeError("Do not access the size attribute before having read all data")
         return self._size
 
     @property
     def hash(self):
         if not self._finished:
-            raise AttributeError("do not access hash attribute before having read all data")
+            raise AttributeError("Do not access the hash attribute before having read all data")
         return self._hash
diff --git a/src/moin/storage/backends/fileserver.py b/src/moin/storage/backends/fileserver.py
index c33ec2336..64a7e695d 100644
--- a/src/moin/storage/backends/fileserver.py
+++ b/src/moin/storage/backends/fileserver.py
@@ -2,14 +2,14 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - fileserver backend, exposing part of the filesystem (read-only)
+MoinMoin - fileserver backend, exposing part of the filesystem (read-only).
 
-Files show as single revision items.
+Files show as single-revision items.
 
-  - metadata is made up from fs metadata + mimetype guessing
-  - data is read from the file
+  - Metadata is made up from file system metadata plus MIME type guessing.
+  - Data is read from the file.
 
-Directories create a virtual directory item, listing the files in that
+Directories create a virtual directory item that lists the files in that
 directory.
 """
 
@@ -35,7 +35,7 @@
 
 class Backend(BackendBase):
     """
-    exposes part of the filesystem (read-only)
+    Expose part of the filesystem (read-only).
     """
 
     @override
@@ -69,7 +69,7 @@ def _mkpath(self, key) -> tuple[str, str]:
             # so if the split does not work, the revid is invalid
             # and we raise KeyError like if the rev is not there
             raise KeyError(key)
-        # we get NAME_SEP and need to replace them by os.sep to make valid pathes:
+        # We get NAME_SEP and need to replace it with os.sep to make valid paths:
         if os.sep == NAME_SEP:
             relpath = itemname
         else:
@@ -169,7 +169,7 @@ def _get_data(self, itemname: str, path: str) -> BufferedReader | BytesIO:
 
     @override
     def __iter__(self):
-        # note: instead of just yielding the relative <path>, yield <path>.<mtime>,
+        # Note: Instead of just yielding the relative <path>, yield <path>.<mtime>,
         # so if the file is updated, the revid will change (and the indexer's
         # update() method can efficiently update the index).
         for dirpath, dirnames, filenames in os.walk(self.path):
diff --git a/src/moin/storage/backends/stores.py b/src/moin/storage/backends/stores.py
index 634aeeba6..b69d18e1b 100644
--- a/src/moin/storage/backends/stores.py
+++ b/src/moin/storage/backends/stores.py
@@ -3,17 +3,17 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - backend that ties together 2 key/value stores
+MoinMoin - backend that ties together two key/value stores.
 
 A meta store (a ByteStore):
 
-- key = revid UUID (bytes, ascii)
-- value = bytes (bytes, utf-8)
+- key = revid UUID (bytes, ASCII)
+- value = bytes (UTF-8)
 
 A data store (a FileStore):
 
-- key = dataid UUID (bytes, ascii)
-- value = file (gets/returns open file instances, to read/write binary data)
+- key = dataid UUID (bytes, ASCII)
+- value = file (gets/returns open file instances to read/write binary data)
 
 See the stores package for already implemented key/value stores.
 """
@@ -35,7 +35,7 @@
 
 class Backend(BackendBase):
     """
-    ties together a store for metadata and a store for data, readonly
+    Tie together a store for metadata and a store for data, read-only.
     """
 
     @override
diff --git a/src/moin/storage/error.py b/src/moin/storage/error.py
index 3011bcefe..48edaa593 100644
--- a/src/moin/storage/error.py
+++ b/src/moin/storage/error.py
@@ -4,7 +4,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin storage errors
+MoinMoin - storage errors.
 """
 
 
diff --git a/src/moin/storage/middleware/__init__.py b/src/moin/storage/middleware/__init__.py
index fb78c09ef..c83dffcb5 100644
--- a/src/moin/storage/middleware/__init__.py
+++ b/src/moin/storage/middleware/__init__.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - misc. middleware
+MoinMoin - misc. middleware.
 
 Middleware sits either on a backend or on another middleware.
 """
diff --git a/src/moin/storage/middleware/_tests/__init__.py b/src/moin/storage/middleware/_tests/__init__.py
index 1f8a55ac3..42a53da92 100644
--- a/src/moin/storage/middleware/_tests/__init__.py
+++ b/src/moin/storage/middleware/_tests/__init__.py
@@ -2,5 +2,5 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - middleware tests
+MoinMoin - middleware tests.
 """
diff --git a/src/moin/storage/middleware/_tests/test_indexing.py b/src/moin/storage/middleware/_tests/test_indexing.py
index 882159e15..0e4df769c 100644
--- a/src/moin/storage/middleware/_tests/test_indexing.py
+++ b/src/moin/storage/middleware/_tests/test_indexing.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - indexing middleware tests
+MoinMoin - indexing middleware tests.
 """
 
 from __future__ import annotations
@@ -58,7 +58,7 @@ def dumper(indexer, idx_name):
 
 
 class TestIndexingMiddleware:
-    reinit_storage = True  # cleanup after each test method
+    reinit_storage = True  # Clean up after each test method
 
     @pytest.fixture(autouse=True)
     def _imw(self):
@@ -75,7 +75,7 @@ def test_store_revision(self):
         item = self.imw[item_name]
         rev = item.store_revision(dict(name=[item_name]), BytesIO(data), return_rev=True)
         revid = rev.revid
-        # check if we have the revision now:
+        # Check if we have the revision now:
         item = self.imw[item_name]
         assert item  # does exist
         rev = item.get_revision(revid)
@@ -482,7 +482,7 @@ def test_parentnames(self):
 
 
 class TestProtectedIndexingMiddleware:
-    reinit_storage = True  # cleanup after each test method
+    reinit_storage = True  # Clean up after each test method
 
     @pytest.fixture
     def cfg(self):
diff --git a/src/moin/storage/middleware/_tests/test_protecting.py b/src/moin/storage/middleware/_tests/test_protecting.py
index e216f5fe0..d2d18299f 100644
--- a/src/moin/storage/middleware/_tests/test_protecting.py
+++ b/src/moin/storage/middleware/_tests/test_protecting.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - protecting middleware tests
+MoinMoin - protecting middleware tests.
 """
 
 from __future__ import annotations
@@ -37,7 +37,7 @@
 
 class FakeUser(User):
     """
-    fake user object, just to give user.name
+    Fake user object; provides user.name.
     """
 
     def __init__(self, name):
@@ -56,7 +56,7 @@ def protected_imw(self, _imw: IndexingMiddleware):
         return self.imw
 
     def _dummy(self):
-        # replacement for tests that use unsupported methods / attributes
+        # Replacement for tests that use unsupported methods/attributes
         pass
 
     test_index_rebuild = _dummy
@@ -83,7 +83,7 @@ def test_documents(self):
 
     def test_getitem(self):
         revid_unprotected, revid_protected = self.make_items("joe:read", "boss:read")
-        # now testing:
+        # Now testing:
         item = self.imw[UNPROTECTED]
         r = item[revid_unprotected]
         assert r.data.read() == UNPROTECTED_CONTENT
@@ -93,7 +93,7 @@ def test_getitem(self):
 
     def test_write(self):
         revid_unprotected, revid_protected = self.make_items("joe:write", "boss:write")
-        # now testing:
+        # Now testing:
         item = self.imw[UNPROTECTED]
         item.store_revision(
             dict(name=[UNPROTECTED], acl="joe:write", contenttype="text/plain;charset=utf-8"),
@@ -107,14 +107,14 @@ def test_write(self):
             )
 
     def test_write_create(self):
-        # now testing:
+        # Now testing:
         item_name = "newitem"
         item = self.imw[item_name]
         item.store_revision(dict(name=[item_name], contenttype="text/plain;charset=utf-8"), BytesIO(b"new content"))
 
     def test_overwrite_revision(self):
         revid_unprotected, revid_protected = self.make_items("joe:write,destroy", "boss:write,destroy")
-        # now testing:
+        # Now testing:
         item = self.imw[UNPROTECTED]
         item.store_revision(
             dict(
@@ -141,7 +141,7 @@ def test_overwrite_revision(self):
 
     def test_destroy_revision(self):
         revid_unprotected, revid_protected = self.make_items("joe:destroy", "boss:destroy")
-        # now testing:
+        # Now testing:
         item = self.imw[UNPROTECTED]
         item.destroy_revision(revid_unprotected)
         item = self.imw[PROTECTED]
@@ -150,15 +150,15 @@ def test_destroy_revision(self):
 
     def test_destroy_middle_revision(self):
         item, item_name, revid0, revid1, revid2 = self._store_three_revs("joe:read,write,destroy")
-        # destroy the middle revision:
+        # Destroy the middle revision:
         item.destroy_revision(revid1)
         with item.get_revision(revid2) as rev:
-            # validate that the parentid of remaining rev was updated
+            # Validate that the parentid of the remaining revision was updated
             assert rev.meta[PARENTID] == revid0
 
     def test_destroy_item(self):
         revid_unprotected, revid_protected = self.make_items("joe:destroy", "boss:destroy")
-        # now testing:
+        # Now testing:
         item = self.imw[UNPROTECTED]
         item.destroy_all_revisions()
         item = self.imw[PROTECTED]
diff --git a/src/moin/storage/middleware/_tests/test_routing.py b/src/moin/storage/middleware/_tests/test_routing.py
index 40324b920..73f37e3d5 100644
--- a/src/moin/storage/middleware/_tests/test_routing.py
+++ b/src/moin/storage/middleware/_tests/test_routing.py
@@ -52,7 +52,7 @@ def test_store_get_del(router):
     other_name = "other:bar"
     other_backend_name, other_revid = router.store(dict(name=[other_name]), BytesIO(b""))
 
-    # check if store() updates the to-store metadata with correct NAMESPACE and NAME
+    # Check if store() updates the to-store metadata with correct NAMESPACE and NAME
     default_meta, _ = router.retrieve(default_backend_name, default_revid)
     other_meta, _ = router.retrieve(other_backend_name, other_revid)
     assert "" == default_meta[NAMESPACE]
@@ -60,7 +60,7 @@ def test_store_get_del(router):
     assert other_name.split(":")[0] == other_meta[NAMESPACE]
     assert other_name.split(":")[1] == other_meta[NAME][0]
 
-    # delete revs:
+    # Delete revisions:
     router.remove(default_backend_name, default_revid, destroy_data=True)
     router.remove(other_backend_name, other_revid, destroy_data=True)
 
diff --git a/src/moin/storage/middleware/_tests/test_serialization.py b/src/moin/storage/middleware/_tests/test_serialization.py
index c295b2834..86e3c2006 100644
--- a/src/moin/storage/middleware/_tests/test_serialization.py
+++ b/src/moin/storage/middleware/_tests/test_serialization.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - serializer / deserializer tests
+MoinMoin - serializer/deserializer tests.
 """
 
 from io import BytesIO
@@ -38,18 +38,18 @@ def pytest_generate_tests(metafunc):
 
 @pytest.fixture
 def source(request, tmpdir):
-    # scenario
+    # Scenario
     return make_middleware(request, tmpdir)
 
 
 @pytest.fixture
 def target(request, tmpdir):
-    # scenario
+    # Scenario
     return make_middleware(request, tmpdir)
 
 
 def make_middleware(request, tmpdir):
-    # scenario
+    # Scenario
     meta_store = BytesStore()
     data_store = FileStore()
     _backend = MutableBackend(meta_store, data_store)
diff --git a/src/moin/storage/middleware/_tests/test_validation.py b/src/moin/storage/middleware/_tests/test_validation.py
index a013ef195..8132ddc6e 100644
--- a/src/moin/storage/middleware/_tests/test_validation.py
+++ b/src/moin/storage/middleware/_tests/test_validation.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - validation tests
+MoinMoin - validation tests.
 """
 
 from moin.storage.middleware.validation import ContentMetaSchema, UserMetaSchema
@@ -18,7 +18,7 @@
 class TestValidation:
     def test_content(self):
         class REV(dict):
-            """fake rev"""
+            """Fake revision"""
 
         rev = REV()
         rev[keys.ITEMID] = make_uuid()
diff --git a/src/moin/storage/middleware/indexing.py b/src/moin/storage/middleware/indexing.py
index 893490424..54ed61318 100644
--- a/src/moin/storage/middleware/indexing.py
+++ b/src/moin/storage/middleware/indexing.py
@@ -5,47 +5,46 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - indexing middleware
+MoinMoin - indexing middleware.
 
-The backends and stores moin uses are rather simple, it is mostly just a
-unsorted / unordered bunch of revisions (meta and data) with iteration.
+The backends and stores Moin uses are rather simple; they are mostly just an
+unsorted/unordered bunch of revisions (meta and data) with iteration.
 
-The indexer middleware adds the needed power: after all metadata and data
-is indexed, we can do all sorts of operations on the indexer level:
+The indexing middleware adds the needed power: after all metadata and data
+are indexed, we can do all sorts of operations on the indexing level:
 * searching
-* lookup by name, uuid, ...
+* lookup by name, UUID, ...
 * selecting
 * listing
 
 Using Whoosh (a fast pure-Python indexing and search library), we build,
-maintain and use 2 indexes:
+maintain, and use two indexes:
 
 * "all revisions" index (big, needed for history search)
 * "latest revisions" index (smaller, just the current revisions)
 
 When creating or destroying revisions, indexes are automatically updated.
 
-There is also code to do a full index rebuild in case it gets damaged, lost
+There is also code to do a full index rebuild in case it gets damaged, lost,
 or needs rebuilding for other reasons. There is also index update code to
-do a quick "intelligent" update of a "mostly ok" index, that just adds,
-updates, deletes stuff that is different in backend compared to current index.
+do a quick, intelligent update of a mostly OK index that just adds,
+updates, or deletes entries that differ in the backend compared to the current index.
 
 Indexing is the only layer that can easily deal with **names** (it can
-easily translate names to UUIDs and vice versa) and with **items** (it
-knows current revision, it can easily list and order historial revisions),
-using the index.
+translate names to UUIDs and vice versa) and with **items** (it knows the
+current revision; it can easily list and order historical revisions), using the index.
 
-The layers below are using UUIDs to identify revisions meta and data:
+The layers below use UUIDs to identify revision metadata and data:
 
 * revid (metaid) - a UUID identifying a specific revision (revision metadata)
-* dataid - a UUID identifying some specific revision data (optional), it is
+* dataid - a UUID identifying some specific revision data (optional); it is
   just stored into revision metadata.
-* itemid - a UUID identifying an item (== a set of revisions), it is just
-  stored into revision metadata. itemid is only easily usable on indexing
+* itemid - a UUID identifying an item (a set of revisions); it is just
+  stored into revision metadata. itemid is only easily usable on the indexing
   level.
 
-Many methods provided by the indexing middleware will be fast, because they
-will not access the layers below (like the backend), but just the index files,
+Many methods provided by the indexing middleware are fast, because they
+will not access the layers below (like the backend), but just the index files;
 usually it is even just the small and thus quick latest-revs index.
 """
 
diff --git a/src/moin/storage/middleware/protecting.py b/src/moin/storage/middleware/protecting.py
index abd1f5250..9772e7f1d 100644
--- a/src/moin/storage/middleware/protecting.py
+++ b/src/moin/storage/middleware/protecting.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - protecting middleware
+MoinMoin - protecting middleware.
 
 This checks ACLs (access control lists), so a user will not be able to do
 operations without the respective permissions.
@@ -46,12 +46,12 @@
 
 class AccessDenied(Exception):
     """
-    raised when a user is denied access to an Item or Revision by ACL.
+    Raised when a user is denied access to an Item or Revision by ACL.
     """
 
 
 def gen_fqnames(meta):
-    """Generate fqnames from meta data."""
+    """Generate fqnames from metadata."""
     if meta[NAME]:
         return [CompositeName(meta[NAMESPACE], NAME_EXACT, name) for name in meta[NAME]]
     return [CompositeName(meta[NAMESPACE], ITEMID, meta[ITEMID])]
diff --git a/src/moin/storage/middleware/routing.py b/src/moin/storage/middleware/routing.py
index 427ca8e62..6ee71bd94 100644
--- a/src/moin/storage/middleware/routing.py
+++ b/src/moin/storage/middleware/routing.py
@@ -3,9 +3,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - namespaces middleware
+MoinMoin - namespace routing middleware.
 
-Routes requests to different backends depending on the namespace.
+Route requests to different backends depending on the namespace.
 """
 
 from __future__ import annotations
@@ -22,7 +22,7 @@
 
 class Backend:
     """
-    namespace dispatcher, behaves readonly for readonly mounts
+    Namespace dispatcher; behaves read-only for read-only mounts.
     """
 
     def __init__(self, namespaces: NamespaceMapping, backends: BackendMapping):
@@ -63,7 +63,7 @@ def __init__(self, namespaces: NamespaceMapping, backends: BackendMapping):
     @classmethod
     def from_uri(cls, uri):
         """
-        create an instance using the data given in uri
+        Create an instance using the data given in the URI.
         """
         raise NotImplementedError
 
@@ -77,12 +77,12 @@ def close(self):
 
     def _get_backend(self, fq_names: list[str]):
         """
-        For a given fully-qualified itemname (i.e. something like ns:itemname)
-        find the backend it belongs to, the itemname without namespace
-        spec and the namespace of the backend.
+        For a given fully qualified item name (e.g., "ns:itemname"),
+        find the backend it belongs to, the item name without the namespace
+        specification, and the namespace of the backend.
 
-        :param fq_names: fully-qualified itemnames
-        :returns: tuple of (backend name, local item name, namespace)
+        :param fq_names: Fully qualified item names.
+        :returns: Tuple of (backend name, local item name, namespace).
         """
         fq_name = fq_names[0]
         for namespace, backend_name in self.namespaces:
@@ -135,7 +135,7 @@ def store(self, meta, data):
         backend = self.backends[backend_name]
 
         if not isinstance(backend, MutableBackendBase):
-            raise TypeError(f"backend {backend_name} is readonly!")
+            raise TypeError(f"backend {backend_name} is read-only!")
 
         revid = backend.store(meta, data)
 
@@ -147,5 +147,5 @@ def store(self, meta, data):
     def remove(self, backend_name, revid, destroy_data):
         backend = self.backends[backend_name]
         if not isinstance(backend, MutableBackendBase):
-            raise TypeError(f"backend {backend_name} is readonly")
+            raise TypeError(f"backend {backend_name} is read-only")
         backend.remove(revid, destroy_data)
diff --git a/src/moin/storage/middleware/serialization.py b/src/moin/storage/middleware/serialization.py
index c90e00144..47ba8d7e2 100644
--- a/src/moin/storage/middleware/serialization.py
+++ b/src/moin/storage/middleware/serialization.py
@@ -3,16 +3,16 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - backend serialization / deserialization
+MoinMoin - backend serialization/deserialization.
 
-We use a simple custom format here::
+We use a simple custom format::
 
     4 bytes length of meta (m)
-    m bytes metadata (json serialization, utf-8 encoded)
+    m bytes metadata (JSON serialization, UTF-8 encoded)
             (the metadata contains the data length d in meta[SIZE])
     d bytes binary data
     ... (repeat for all meta/data)
-    4 bytes 00 (== length of next meta -> there is none, this is the end)
+    4 bytes 00 (== length of next meta -> there is none; this is the end)
 """
 
 import struct
@@ -51,7 +51,7 @@ def serialize_rev(meta, data):
 
 
 def get_rev_str(meta):
-    """return string representing a revision for use in logging"""
+    """Return a string representing a revision for use in logging."""
     ns = meta.get(NAMESPACE)
     name = None
     names = meta.get(NAME)
@@ -64,11 +64,13 @@ def get_rev_str(meta):
 
 
 def correcting_rev_iter(backend: Backend):
-    """iterate over the revisions in a store yielding corrected metadata
-    yields tuples of meta, data, issues
-        meta: dict of metadata with corrected size and sha1
+    """Iterate over the revisions in a store, yielding corrected metadata.
+
+    Yields tuples of (meta, data, issues):
+        meta: dict of metadata with corrected SIZE and HASH_ALGORITHM
         data: the item data
-        issues: list of str messages describing issues which were corrected"""
+        issues: list of strings describing issues that were corrected
+    """
     for revid in backend:
         issues = []
         if isinstance(revid, tuple):
diff --git a/src/moin/storage/middleware/validation.py b/src/moin/storage/middleware/validation.py
index 208e31834..2c52b9f75 100644
--- a/src/moin/storage/middleware/validation.py
+++ b/src/moin/storage/middleware/validation.py
@@ -3,23 +3,22 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - validation for storage meta / data
+MoinMoin - validation for storage metadata and data.
 
-validation modes:
+Validation modes:
 
-trusted == False: for metadata coming from user input (like from web form) -
-                  in this mode some values will be forced (e.g. mtime,
+trusted == False: for metadata coming from user input (such as a web form) —
+                  in this mode some values will be forced (e.g., mtime,
                   address, hostname, ...).
 
-trusted == True: for metadata coming from trusted sources (like loading
-                 backups, tests, ...)
+trusted == True: for metadata coming from trusted sources (such as loading
+                 backups or running tests).
 
 The mode trusted=True/False and the values for forcing can be given as extra
-params to store_revision (see indexing module).
+parameters to store_revision (see the indexing module).
 
-If supplied metadata is missing some values that are required and have sane
-defaults, the validators may implant the defaults into the metadata or reject
-the data.
+If supplied metadata is missing required values that have sane defaults,
+validators may insert the defaults into the metadata or reject the data.
 """
 
 import time
@@ -41,7 +40,7 @@ class DuckDict(Dict):
 
 def uuid_validator(element, state):
     """
-    a uuid must be a hex unicode string of specific length
+    A UUID must be a hex string of a specific length.
     """
     v = element.value
     if not isinstance(v, str):
@@ -57,7 +56,7 @@ def uuid_validator(element, state):
 
 def itemid_validator(element, state):
     """
-    an itemid is a uuid that identifies an item
+    An itemid is a UUID that identifies an item.
     """
     if not state["trusted"] or element.raw is Unset:
         fqname = state[keys.FQNAME]
@@ -71,7 +70,7 @@ def itemid_validator(element, state):
 
 def revid_validator(element, state):
     """
-    a revid is a uuid that identifies a revision
+    A revid is a UUID that identifies a revision.
     """
     if element.raw is Unset:
         return True  # revid will be autogenerated by store
@@ -80,7 +79,7 @@ def revid_validator(element, state):
 
 def userid_validator(element, state):
     """
-    a userid is a uuid that identifies a user (profile)
+    A userid is a UUID that identifies a user (profile).
     """
     if not state["trusted"]:
         userid = state[keys.USERID]
@@ -93,7 +92,7 @@ def userid_validator(element, state):
 
 def name_validator(element, state):
     """
-    a (item/revision) name
+    An item or revision name.
     """
     if element.raw is Unset:
         element.set(state[keys.NAME])
diff --git a/src/moin/storage/stores/__init__.py b/src/moin/storage/stores/__init__.py
index 35b0bc6bb..6630c895f 100644
--- a/src/moin/storage/stores/__init__.py
+++ b/src/moin/storage/stores/__init__.py
@@ -5,8 +5,8 @@
 """
 MoinMoin - simple key/value stores.
 
-If some kvstore implementation you'ld like to use is missing from this package,
-you can likely implement it adding very little and rather easy code.
+If some key/value store implementation you'd like to use is missing from this package,
+you can likely implement it by adding very little and rather easy code.
 """
 
 from abc import abstractmethod
@@ -23,29 +23,29 @@ class StoreBase(Mapping):
     @abstractmethod
     def from_uri(cls, uri):
         """
-        return an instance constructed from the given uri
+        Return an instance constructed from the given URI.
         """
 
     def __init__(self, **kw):
         """
-        lazy stuff - just remember pathes, urls, database name, ... -
+        Lazy initialization — just remember paths, URLs, database name, etc.,
         whatever we need for open(), create(), etc.
         """
 
     def open(self):
         """
-        open the store, prepare it for usage
+        Open the store; prepare it for usage.
         """
 
     def close(self):
         """
-        close the store, stop using it, free resources (except stored data)
+        Close the store; stop using it; free resources (except stored data).
         """
 
     @abstractmethod
     def __iter__(self):
         """
-        iterate over keys present in the store
+        Iterate over keys present in the store.
         """
 
     def __len__(self):
@@ -54,7 +54,7 @@ def __len__(self):
     @abstractmethod
     def __getitem__(self, key):
         """
-        return data stored for key
+        Return data stored for key.
         """
 
 
@@ -62,7 +62,7 @@ class BytesStoreBase(StoreBase):
     @abstractmethod
     def __getitem__(self, key):
         """
-        return bytestring for key if exists else raise KeyError
+        Return a byte string for key if it exists; otherwise raise KeyError.
         """
 
 
@@ -70,9 +70,9 @@ class FileStoreBase(StoreBase):
     @abstractmethod
     def __getitem__(self, key):
         """
-        return a filelike for key if exists else raise KeyError
+        Return a file-like object for key if it exists; otherwise raise KeyError.
 
-        note: the caller is responsible for closing the open file we return
+        Note: The caller is responsible for closing the open file we return
               after usage.
         """
 
@@ -84,24 +84,24 @@ class MutableStoreBase(StoreBase, MutableMapping):
 
     def create(self):
         """
-        create an empty store
+        Create an empty store.
         """
 
     def destroy(self):
         """
-        destroy the store (erase all stored data, remove store)
+        Destroy the store (erase all stored data, remove store).
         """
 
     @abstractmethod
     def __setitem__(self, key, value):
         """
-        store value under key
+        Store value under key.
         """
 
     @abstractmethod
     def __delitem__(self, key):
         """
-        delete the key, dereference the related value in the store
+        Delete the key, dereference the related value in the store.
         """
 
 
@@ -109,16 +109,16 @@ class BytesMutableStoreBase(MutableStoreBase):
     @abstractmethod
     def __setitem__(self, key, value):
         """
-        store a bytestring for key
+        Store a bytestring for key.
         """
 
 
 class BytesMutableStoreMixin:
     """
-    mix this into a FileMutableStore to get a BytesMutableStore, like shown here:
+    Mix this into a FileMutableStore to get a BytesMutableStore, like shown here:
 
     class BytesStore(BytesMutableStoreMixin, FileStore, BytesMutableStoreBase):
-        # that's all, nothing more needed
+        # That’s all; nothing more needed.
     """
 
     def __getitem__(self, key):
@@ -134,20 +134,20 @@ class FileMutableStoreBase(MutableStoreBase):
     @abstractmethod
     def __setitem__(self, key, stream):
         """
-        store a filelike for key
+        Store a file-like object for key.
 
-        note: caller is responsible for giving us a open file AND also for
-              closing that file later. caller must not rely on some specific
+        Note: caller is responsible for giving us an open file and also for
+              closing that file later. The caller must not rely on any specific
               file pointer position after we return.
         """
 
 
 class FileMutableStoreMixin:
     """
-    mix this into a BytesMutableStore to get a FileMutableStore, like shown here:
+    Mix this into a BytesMutableStore to get a FileMutableStore, like shown here:
 
     class FileStore(FileMutableStoreMixin, BytesStore, FileMutableStoreBase)
-        # that's all, nothing more needed
+        # That’s all; nothing more needed.
     """
 
     def __getitem__(self, key):
diff --git a/src/moin/storage/stores/_tests/__init__.py b/src/moin/storage/stores/_tests/__init__.py
index f1a3008ac..713f69683 100644
--- a/src/moin/storage/stores/_tests/__init__.py
+++ b/src/moin/storage/stores/_tests/__init__.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - store tests
+MoinMoin - store tests.
 """
 
 
diff --git a/src/moin/storage/stores/_tests/conftest.py b/src/moin/storage/stores/_tests/conftest.py
index 6a2b15211..5fb123da7 100644
--- a/src/moin/storage/stores/_tests/conftest.py
+++ b/src/moin/storage/stores/_tests/conftest.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - store test magic
+MoinMoin - store test utilities.
 """
 
 import pytest
@@ -66,13 +66,13 @@ def make_store(request, tmpdir):
     klass = getattr(storemodule, kind)
     construct = constructors.get(storename)
     if construct is None:
-        pytest.xfail(f"don't know how to construct {storename} store")
+        pytest.xfail(f"Don't know how to construct the {storename} store")
     store = construct(klass, tmpdir)
     store.create()
     store.open()
     request.addfinalizer(store.close)
-    # for debugging, you can disable the next line to see the stuff in the
-    # store and examine it, but usually we want to clean up afterwards:
+    # For debugging, you can disable the next line to keep the content in the
+    # store and examine it; usually, we clean up afterwards:
     request.addfinalizer(store.destroy)
     return store
 
diff --git a/src/moin/storage/stores/_tests/test_all.py b/src/moin/storage/stores/_tests/test_all.py
index 562789f2d..19a8a3f9d 100644
--- a/src/moin/storage/stores/_tests/test_all.py
+++ b/src/moin/storage/stores/_tests/test_all.py
@@ -53,7 +53,7 @@ def test_len(store):
 
 def test_perf(store):
     # XXX: introduce perf test option
-    pytest.skip("usually we do no performance tests")
+    pytest.skip("Usually we do not run performance tests.")
     for i in range(1000):
         key = value = str(i)
         store[key] = value.encode()
diff --git a/src/moin/storage/stores/_tests/test_fs.py b/src/moin/storage/stores/_tests/test_fs.py
index abf20a84f..9b1b27718 100644
--- a/src/moin/storage/stores/_tests/test_fs.py
+++ b/src/moin/storage/stores/_tests/test_fs.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - fs store tests
+MoinMoin - FS store tests.
 """
 
 import pytest
diff --git a/src/moin/storage/stores/_tests/test_memory.py b/src/moin/storage/stores/_tests/test_memory.py
index 85f895f17..30672d5d8 100644
--- a/src/moin/storage/stores/_tests/test_memory.py
+++ b/src/moin/storage/stores/_tests/test_memory.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - memory store tests
+MoinMoin - memory store tests.
 """
 
 import pytest
diff --git a/src/moin/storage/stores/_tests/test_sqla.py b/src/moin/storage/stores/_tests/test_sqla.py
index 19e993e38..eab8bb0b0 100644
--- a/src/moin/storage/stores/_tests/test_sqla.py
+++ b/src/moin/storage/stores/_tests/test_sqla.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - sqla store tests
+MoinMoin - SQLA store tests.
 """
 
 
diff --git a/src/moin/storage/stores/_tests/test_sqlite.py b/src/moin/storage/stores/_tests/test_sqlite.py
index f703484a1..339bc1b7f 100644
--- a/src/moin/storage/stores/_tests/test_sqlite.py
+++ b/src/moin/storage/stores/_tests/test_sqlite.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - sqlite store tests
+MoinMoin - SQLite store tests.
 """
 
 
diff --git a/src/moin/storage/stores/fs.py b/src/moin/storage/stores/fs.py
index cb607ef30..78c6d0566 100644
--- a/src/moin/storage/stores/fs.py
+++ b/src/moin/storage/stores/fs.py
@@ -2,9 +2,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - filesystem store
+MoinMoin - filesystem store.
 
-Store into filesystem, one file per k/v pair.
+Store in the file system, one file per key/value pair.
 """
 
 import os
@@ -18,7 +18,7 @@ class FileStore(FileMutableStoreBase):
     """
     A simple filesystem-based store.
 
-    keys are required to be valid filenames.
+    Keys are required to be valid filenames.
     """
 
     @classmethod
@@ -27,7 +27,7 @@ def from_uri(cls, uri):
 
     def __init__(self, path):
         """
-        :param path: base directory used for this store
+        :param path: Base directory used for this store.
         """
         self.path = path
 
@@ -66,4 +66,4 @@ def __setitem__(self, key, stream):
 
 
 class BytesStore(BytesMutableStoreMixin, FileStore, BytesMutableStoreBase):
-    """filesystem BytesStore"""
+    """Filesystem BytesStore."""
diff --git a/src/moin/storage/stores/memory.py b/src/moin/storage/stores/memory.py
index 31657e1e8..e1a91d874 100644
--- a/src/moin/storage/stores/memory.py
+++ b/src/moin/storage/stores/memory.py
@@ -4,7 +4,7 @@
 """
 MoinMoin - memory store
 
-Stores k/v pairs into memory (RAM, non-persistent!).
+Stores key/value pairs in memory (RAM, non-persistent!).
 
 Note: likely this is mostly useful for unit tests.
 """
@@ -51,4 +51,4 @@ def __setitem__(self, key, value):
 
 
 class FileStore(FileMutableStoreMixin, BytesStore, FileMutableStoreBase):
-    """memory FileStore"""
+    """In-memory FileStore."""
diff --git a/src/moin/storage/stores/sqla.py b/src/moin/storage/stores/sqla.py
index 17bcafc3b..77d7a8286 100644
--- a/src/moin/storage/stores/sqla.py
+++ b/src/moin/storage/stores/sqla.py
@@ -2,9 +2,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - sqlalchemy store
+MoinMoin - SQLAlchemy store.
 
-Stores k/v pairs into any database supported by sqlalchemy.
+Stores key/value pairs into any database supported by SQLAlchemy.
 """
 
 import os
@@ -28,10 +28,10 @@ class BytesStore(BytesMutableStoreBase):
     @classmethod
     def from_uri(cls, uri):
         """
-        Create a new cls instance from the using the uri
+        Create a new cls instance from the given URI.
 
-        :param cls: Class to create
-        :param uri: The database uri that we pass on to SQLAlchemy.
+        :param cls: Class to create.
+        :param uri: The database URI that we pass on to SQLAlchemy.
         """
         # using "::" to support windows pathnames that
         # may include ":" after the drive letter.
@@ -40,9 +40,9 @@ def from_uri(cls, uri):
 
     def __init__(self, db_uri=None, table_name="store", verbose=False):
         """
-        :param db_uri: The database uri that we pass on to SQLAlchemy.
+        :param db_uri: The database URI that we pass on to SQLAlchemy.
                        May contain user/password/host/port/etc.
-        :param verbose: Verbosity setting. If set to True this will print all SQL queries
+        :param verbose: Verbosity setting. If set to True, this will print all SQL queries
                         to the console.
         """
         self.db_uri = db_uri
@@ -58,8 +58,8 @@ def __init__(self, db_uri=None, table_name="store", verbose=False):
     def open(self):
         db_uri = self.db_uri
         if db_uri is None:
-            # These are settings that apply only for development / testing only. The additional args are necessary
-            # due to some limitations of the in-memory sqlite database.
+            # These settings apply only for development/testing. The additional args are necessary
+            # due to some limitations of the in-memory SQLite database.
             db_uri = "sqlite:///:memory:"
             self.engine = create_engine(db_uri, poolclass=StaticPool, connect_args={"check_same_thread": False})
         else:
@@ -124,4 +124,4 @@ def __setitem__(self, key, value):
 
 
 class FileStore(FileMutableStoreMixin, BytesStore, FileMutableStoreBase):
-    """sqlalchemy FileStore"""
+    """SQLAlchemy FileStore."""
diff --git a/src/moin/storage/stores/sqlite.py b/src/moin/storage/stores/sqlite.py
index e132767b9..5ca822bbe 100644
--- a/src/moin/storage/stores/sqlite.py
+++ b/src/moin/storage/stores/sqlite.py
@@ -2,13 +2,12 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - sqlite3 key/value store
+MoinMoin - SQLite key/value store.
 
-This store stores into sqlite3 table, using a single db file in the filesystem.
-You can use the same db file for multiple stores, just using a different table
-name.
+This store stores data in a SQLite table, using a single DB file in the file system.
+You can use the same DB file for multiple stores by using different table names.
 
-Optionally, you can use zlib/"gzip" compression.
+Optionally, zlib ("gzip") compression can be used.
 """
 
 import os
@@ -22,20 +21,20 @@
 
 class BytesStore(BytesMutableStoreBase):
     """
-    A simple sqlite3 based store.
+    A simple SQLite-based store.
     """
 
     @classmethod
     def from_uri(cls, uri):
         """
-        Create a new cls instance using the parameters provided in the uri
+        Create a new cls instance from the given URI.
 
         :param cls: Class to create
-        :param uri: The URI should follow the following template
+        :param uri: The URI should follow the template
                     db_name::table_name::compression_level
-                    where table_name and compression level are optional
+                    where table_name and compression_level are optional
         """
-        # using "::" to support windows pathnames that
+        # Using "::" to support Windows pathnames that
         # may include ":" after the drive letter.
         params = uri.split("::")
         if len(params) == 3:
@@ -46,13 +45,13 @@ def __init__(self, db_name, table_name="store", compression_level=0):
         """
         Just store the params.
 
-        :param db_name: database (file)name
-        :param table_name: table to use for this store (we only touch this table)
+        :param db_name: Database (file) name
+        :param table_name: Table to use for this store (we only touch this table)
         :param compression_level: zlib compression level
-                                  0 = no compr, 1 = fast/small, ..., 9 = slow/smaller
-                                  we recommend 0 for low cpu usage, 1 for low disk space usage
-                                  high compression levels don't give much better compression,
-                                  but use lots of cpu (e.g. 6 is about 2x more cpu than 1).
+                                  0 = no compression, 1 = fast/small, ..., 9 = slow/smaller
+                                  We recommend 0 for low CPU usage, 1 for low disk space usage.
+                                  Higher compression levels do not give much better compression
+                                  but use lots of CPU (e.g., 6 is about 2× more CPU than 1).
         """
         self.db_name = db_name
         self.table_name = table_name
@@ -89,8 +88,8 @@ def __delitem__(self, key):
     def _compress(self, value):
         if self.compression_level:
             value = zlib.compress(value, self.compression_level)
-        # we store some magic start/end markers and the compression level,
-        # so we can later uncompress correctly (or rather NOT uncompress if level == 0)
+        # We store magic start/end markers and the compression level,
+        # so we can later decompress correctly (or rather not decompress if level == 0)
         header = "{{{GZ%d|" % self.compression_level
         tail = "}}}"
         return header.encode() + value + tail.encode()
@@ -109,19 +108,19 @@ def __getitem__(self, key):
         rows = list(self.conn.execute(f"select value from {self.table_name} where key=?", (key,)))
         if not rows:
             raise KeyError(key)
-        value = str(rows[0]["value"])  # a str in base64 encoding
+        value = str(rows[0]["value"])  # a string in base64 encoding
         value = base64.b64decode(value.encode())
         return self._decompress(value)
 
     def __setitem__(self, key, value):
         value = self._compress(value)
         with self.conn:
-            value = base64.b64encode(value).decode()  # a str in base64 encoding
+            value = base64.b64encode(value).decode()  # a string in base64 encoding
             try:
                 self.conn.execute(f"insert into {self.table_name} values (?, ?)", (key, value))
             except IntegrityError:
                 if NAMESPACE_USERPROFILES in self.db_name:
-                    # userprofiles namespace does support revisions so we update existing row
+                    # The userprofiles namespace does not support revisions, so we update the existing row
                     self.conn.execute(
                         'UPDATE {0} SET value = "{2}" WHERE key = "{1}"'.format(self.table_name, key, value)
                     )
@@ -130,4 +129,4 @@ def __setitem__(self, key, value):
 
 
 class FileStore(FileMutableStoreMixin, BytesStore, FileMutableStoreBase):
-    """sqlite FileStore"""
+    """SQLite FileStore."""
diff --git a/src/moin/storage/stores/wrappers.py b/src/moin/storage/stores/wrappers.py
index d9a03ea27..3e380dc8e 100644
--- a/src/moin/storage/stores/wrappers.py
+++ b/src/moin/storage/stores/wrappers.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - store wrappers
+MoinMoin - store wrappers.
 """
 
 from io import BytesIO
@@ -14,7 +14,7 @@ def __init__(self, stream_store):
         """
         Wrap a file store so it can be used like a byte store.
 
-        :param stream_store: the file/stream store to wrap
+        :param stream_store: The file/stream store to wrap.
         """
         self._st = stream_store
 
diff --git a/src/moin/themes/__init__.py b/src/moin/themes/__init__.py
index a13760486..54a164089 100644
--- a/src/moin/themes/__init__.py
+++ b/src/moin/themes/__init__.py
@@ -5,7 +5,9 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - Theme Support
+MoinMoin - Theme support
+
+Helpers for rendering themed templates and UI elements.
 """
 
 from __future__ import annotations
@@ -59,7 +61,7 @@
 
 
 def get_current_theme():
-    # this might be called at a time when flaskg.user is not setup yet:
+    # This might be called when flaskg.user is not set up yet:
     u = getattr(flaskg, "user", None)
     if u and u.theme_name is not None:
         theme_name = u.theme_name
@@ -85,7 +87,7 @@ def themed_error(e):
             name=item_name
         )
         if e.description.startswith(" "):
-            # leading blank indicates supplemental info, not standard werkzeug message
+            # Leading blank indicates supplemental info, not the standard Werkzeug message
             description += e.description
     else:
         # if we have no special code, we just return the HTTPException instance
@@ -96,7 +98,7 @@ def themed_error(e):
 
 class ThemeSupport:
     """
-    Support code for template feeding.
+    Support utilities used by themes and templates.
     """
 
     def __init__(self, cfg: WikiConfigProtocol):
diff --git a/src/moin/themes/_tests/test_navi_bar.py b/src/moin/themes/_tests/test_navi_bar.py
index ae2db611b..33534fc6c 100644
--- a/src/moin/themes/_tests/test_navi_bar.py
+++ b/src/moin/themes/_tests/test_navi_bar.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - Navibar Tests
+MoinMoin - Tests for the navigation bar
 """
 
 
diff --git a/src/moin/user.py b/src/moin/user.py
index c5f7da7cd..2b0a13e0a 100644
--- a/src/moin/user.py
+++ b/src/moin/user.py
@@ -69,17 +69,17 @@
 
 def create_user(username, password, email, validate=True, is_encrypted=False, verify_email=False, **meta):
     """
-    Create a new user
+    Create a new user.
 
     :param username: unique user name
-    :param password: user's password - see also is_encrypted param
+    :param password: user's password — see also the is_encrypted param
     :param email: unique email address
-    :param validate: if True (default) will validate username, password, email
+    :param validate: if True (default), validate username, password, email,
                         and the uniqueness of the user created
-    :param is_encrypted: if False (default) defines that the password is in
-                        plaintext, when True - password was already encrypted
-    :verify_email: if True email is saved in user.profile[EMAIL_UNVALIDATED],
-                        else email is saved in user.profile[EMAIL]
+    :param is_encrypted: if False (default), the password is in
+                        plain text; when True, the password is already encrypted
+    :param verify_email: if True, the email is saved in user.profile[EMAIL_UNVALIDATED];
+                        otherwise, the email is saved in user.profile[EMAIL]
     :param meta: a dictionary of key-value pairs that represent user metadata and
                         will be stored into user profile metadata
     """
diff --git a/src/moin/utils/__init__.py b/src/moin/utils/__init__.py
index 9c8aac577..5191ca5d1 100644
--- a/src/moin/utils/__init__.py
+++ b/src/moin/utils/__init__.py
@@ -2,8 +2,8 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - Utility Functions
-    General helper functions that are not directly wiki related.
+MoinMoin - utility functions.
+General helper functions that are not directly wiki-related.
 """
 
 from __future__ import annotations
@@ -17,7 +17,7 @@
 from xstatic.main import XStatic
 
 
-# Set pickle protocol, see http://docs.python.org/lib/node64.html
+# Set pickle protocol; see http://docs.python.org/lib/node64.html
 PICKLE_PROTOCOL = pickle.HIGHEST_PROTOCOL
 
 
@@ -34,7 +34,7 @@
 
 def TranslateCDATA(text):
     """
-    Convert a string to a CDATA-encoded one
+    Convert a string to a CDATA-encoded one.
     Copyright (c) 1999-2000 FourThought
     """
     new_string, num_subst = re.subn(g_undoUtf8Pattern, lambda m: m.group(1), text)
@@ -45,7 +45,7 @@ def TranslateCDATA(text):
 
 def TranslateText(text):
     """
-    Convert a string to a PCDATA-encoded one (do minimal encoding)
+    Convert a string to a PCDATA-encoded one (do minimal encoding).
     Copyright (c) 1999-2000 FourThought
     """
     new_string, num_subst = re.subn(g_undoUtf8Pattern, lambda m: m.group(1), text)
@@ -83,24 +83,24 @@ def rangelist(numbers):
 
 def close_file(f):
     """
-    Close a file so a Windows based server can destroy a recently viewed item's file.
+    Close a file so a Windows-based server can delete a recently viewed item's file.
 
-    If not closed, attempts to destroy an open file (before garbage collection removes it)
-    will result an error:
+    If not closed, attempts to delete an open file (before garbage collection removes it)
+    will result in an error:
         The process cannot access the file because it is being used by another process.
     """
-    # some tests reuse BytesIO objects and will fail with I/O operation on closed file.
+    # Some tests reuse BytesIO objects and will fail with I/O operation on closed file.
     if hasattr(f, "close") and not f.closed and not isinstance(f, BytesIO):
         f.close()
 
 
 def utcfromtimestamp(timestamp):
-    """Returns a naive datetime instance representing the timestamp in the UTC timezone"""
+    """Return a naive datetime representing the timestamp in the UTC time zone."""
     return datetime.fromtimestamp(timestamp, timezone.utc).replace(tzinfo=None)
 
 
 def utcnow():
-    """Returns a naive datetime instance representing the current time in the UTC timezone"""
+    """Return a naive datetime representing the current time in the UTC time zone."""
     return datetime.now(timezone.utc).replace(tzinfo=None)
 
 
@@ -114,7 +114,7 @@ def get_xstatic_module_path_map(
             module = import_module(module_name)
         except ModuleNotFoundError as exc:
             raise ConfigurationError(
-                f'The python module "{module_name}" could not be found - check your configuration'
+                f'The Python module "{module_name}" could not be found - check your configuration'
             ) from exc
         xs = XStatic(module, root_url, provider, protocol)
         path_map[xs.name] = xs.base_dir  # type: ignore
diff --git a/src/moin/utils/_tests/test_crypto.py b/src/moin/utils/_tests/test_crypto.py
index 271d2a628..6bb4df53a 100644
--- a/src/moin/utils/_tests/test_crypto.py
+++ b/src/moin/utils/_tests/test_crypto.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - moin.utils.crypto Tests
+MoinMoin - moin.utils.crypto tests.
 """
 
 
@@ -10,10 +10,10 @@
 
 
 class TestRandom:
-    """crypto: random tests"""
+    """crypto: random tests."""
 
     def testRandomString(self):
-        """utils.random_string: test randomness and length"""
+        """utils.random_string: test randomness and length."""
         length = 8
         chars = "abcdefghijklmnopqrstuvwxyz"
         result1 = crypto.random_string(length, chars)
diff --git a/src/moin/utils/_tests/test_diff3.py b/src/moin/utils/_tests/test_diff3.py
index 505198080..eb3824336 100644
--- a/src/moin/utils/_tests/test_diff3.py
+++ b/src/moin/utils/_tests/test_diff3.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.utils.diff3 Tests
+MoinMoin - tests for moin.utils.diff3.
 """
 
 
diff --git a/src/moin/utils/_tests/test_diff_datastruct.py b/src/moin/utils/_tests/test_diff_datastruct.py
index d8b68a873..a4062da7e 100644
--- a/src/moin/utils/_tests/test_diff_datastruct.py
+++ b/src/moin/utils/_tests/test_diff_datastruct.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.utils.diff_datastruct Tests
+MoinMoin - tests for moin.utils.diff_datastruct.
 """
 
 import pytest
diff --git a/src/moin/utils/_tests/test_diff_html.py b/src/moin/utils/_tests/test_diff_html.py
index a3163d628..59de68ac3 100644
--- a/src/moin/utils/_tests/test_diff_html.py
+++ b/src/moin/utils/_tests/test_diff_html.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - moin.utils.diff_html Tests
+MoinMoin - tests for moin.utils.diff_html.
 """
 
 
@@ -20,7 +20,7 @@ def test_indent():
 AAA 004
 AAA 005
 """
-    # expeted result
+    # expected result
     expected = """&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;AAA 001
 AAA 002
 AAA 003
@@ -42,7 +42,7 @@ def test_diff():
 AAA 005
 """
 
-    # Case 1: charobj.ratio() < 0.5 i.e. Insufficient similarity
+    # Case 1: charobj.ratio() < 0.5, i.e., insufficient similarity
     test_input2 = """ \n
 
 BBB 006
@@ -62,7 +62,7 @@ def test_diff():
     ]
     assert result == expected
 
-    # Case 2 : charobj.ratio() > 0.5 i.e. Some similarities
+    # Case 2: charobj.ratio() > 0.5, i.e., some similarities
     test_input3 = """ \n
 
 AAA 006
diff --git a/src/moin/utils/_tests/test_diff_text.py b/src/moin/utils/_tests/test_diff_text.py
index 60653743f..3542fab8d 100644
--- a/src/moin/utils/_tests/test_diff_text.py
+++ b/src/moin/utils/_tests/test_diff_text.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.utils.diff_text Tests
+MoinMoin - moin.utils.diff_text tests.
 """
 
 
@@ -12,7 +12,7 @@
 class TestDiffText:
 
     def testDiff(self):
-        """utils.diff_text.diff: test correct diff calculation"""
+        """utils.diff_text.diff: test correct diff calculation."""
         in1 = """AAA 001
 AAA 002
 AAA 003
diff --git a/src/moin/utils/_tests/test_filesys.py b/src/moin/utils/_tests/test_filesys.py
index 4242ae6c7..f9f629961 100644
--- a/src/moin/utils/_tests/test_filesys.py
+++ b/src/moin/utils/_tests/test_filesys.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.utils.filesys Tests
+MoinMoin - moin.utils.filesys tests.
 """
 
 import os
@@ -18,7 +18,7 @@
 
 
 class TestRename:
-    """test filesys.rename*"""
+    """Tests for filesys.rename*."""
 
     def setup_method(self, method):
         self.test_dir = tempfile.mkdtemp("", "rename_")
@@ -36,8 +36,8 @@ def makefile(self, fname, content):
     def test_posix_rename_exists(self):
         self.makefile(self.src, "src")
         self.makefile(self.dst, "dst")
-        # posix rename overwrites an existing destination
-        # (on win32, we emulate this behaviour)
+        # POSIX rename overwrites an existing destination.
+        # (On Windows, we emulate this behavior.)
         filesys.rename(self.src, self.dst)
         dst_contents = open(self.dst).read()
         assert dst_contents == "src"
@@ -45,8 +45,8 @@ def test_posix_rename_exists(self):
     def test_win32_rename_exists(self):
         self.makefile(self.src, "src")
         self.makefile(self.dst, "dst")
-        # win32-like rename does not overwrite an existing destination
-        # (on posix, we emulate this behaviour)
+        # Windows-like rename does not overwrite an existing destination.
+        # (On POSIX, we emulate this behavior.)
         pytest.raises(OSError, filesys.rename_no_overwrite, self.src, self.dst)
 
     def test_special_rename_exists(self):
@@ -74,7 +74,7 @@ def test_special_rename_notexists(self):
 
 
 class TestCopy:
-    """test filesys.copytree"""
+    """Tests for filesys.copytree."""
 
     def setup_method(self, method):
         self.test_dir = tempfile.mkdtemp("", "copytree1")
@@ -95,11 +95,11 @@ def test_copytree(self):
         self.makefile(self.src2, "src2")
         self.test_dest_dir = self.test_dir + "_copy"
         filesys.copytree(self.test_dir, self.test_dest_dir)
-        # check for the dir contents
+        # Check that directory contents match.
         assert sorted(os.listdir(self.test_dir)) == sorted(os.listdir(self.test_dest_dir))
 
     def test_dir_exist(self):
-        """raise Error if dir already exist"""
+        """Raise OSError if destination directory already exists."""
         self.test_dest_dir = tempfile.mkdtemp("", "temp_dir")
         with pytest.raises(OSError):
             filesys.copytree(self.test_dir, self.test_dest_dir)
diff --git a/src/moin/utils/_tests/test_forms.py b/src/moin/utils/_tests/test_forms.py
index e95896da2..0c3f80d0c 100644
--- a/src/moin/utils/_tests/test_forms.py
+++ b/src/moin/utils/_tests/test_forms.py
@@ -2,14 +2,14 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - moin.utils.forms Tests
+MoinMoin - moin.utils.forms tests.
 """
 
 from moin.utils import forms
 
 
 class Bind:
-    """class for self defined test_bind attributes"""
+    """Class for self-defined test_bind attributes."""
 
     def __init__(self):
         self.label = "test_content"
diff --git a/src/moin/utils/_tests/test_interwiki.py b/src/moin/utils/_tests/test_interwiki.py
index 395fd536c..36732701f 100644
--- a/src/moin/utils/_tests/test_interwiki.py
+++ b/src/moin/utils/_tests/test_interwiki.py
@@ -4,7 +4,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.utils.interwiki Tests
+MoinMoin - tests for moin.utils.interwiki.
 """
 
 import tempfile
@@ -53,8 +53,8 @@ def test_url_for_item(self):
             # (item_name, wiki_name='', namespace='', rev=CURRENT, endpoint='frontend.show_item', _external=False):
             (("SomePage", "", "", "", CURRENT, "frontend.show_item", True), "http://localhost:8080/SomePage"),
             (("SomePage", "", "", "", CURRENT, "frontend.modify_item", False), "/+modify/SomePage"),
-            # FIXME if you set interwiki_map = dict(Self='http://localhost:8080', MoinMoin='http://moinmo.in/', ),
-            # the above line make it fails, it returns http://localhost/+modify/SomePage
+            # FIXME If you set interwiki_map = dict(Self='http://localhost:8080', MoinMoin='http://moinmo.in/', ),
+            # the above line makes it fail; it returns http://localhost/+modify/SomePage
             # (('SomePage', '', '', CURRENT, 'frontend.modify_item', True), 'http://localhost:8080/+modify/SomePage'),
             (("SomeRevID", "", "revid", "", revid, "frontend.show_item", False), f"/+show/+{revid}/@revid/SomeRevID"),
             (("SomePage", "", "", "", revid, "frontend.show_item_meta", False), f"/+meta/+{revid}/SomePage"),
@@ -101,7 +101,7 @@ def test_url_for_item(self):
         ]
 
         for (item_name, wiki_name, field, namespace, rev, endpoint, _external), url in tests:
-            # Workaround: substitute %40 with @ to allow both Werkzeug versions 2.2. and 2.3 TODO: remove later
+            # Workaround: substitute %40 with @ to allow both Werkzeug versions 2.2 and 2.3. TODO: remove later
             assert (
                 re.sub("%40", "@", url_for_item(item_name, wiki_name, field, namespace, rev, endpoint, _external))
                 == url
@@ -220,7 +220,7 @@ def test_get_interwiki_home(self):
 
 class TestInterWikiMapBackend:
     """
-    tests for interwiki map
+    Tests for the interwiki map.
     """
 
     def test_load_file(self):
@@ -229,35 +229,35 @@ def test_load_file(self):
         """
         tmpdir = tempfile.mkdtemp()
 
-        # test an invalid file
+        # Test an invalid file.
         with pytest.raises(IOError):
             InterWikiMap.from_file(os.path.join(tmpdir, "void"))
 
-        # test a consistent valid file
+        # Test a valid file.
         testfile = os.path.join(tmpdir, "foo.iwm")
         with open(testfile, "w") as f:
             f.write("foo bar\n" "baz spam\n" "ham end end # this is really the end.")
         testiwm = InterWikiMap.from_file(testfile)
         assert testiwm.iwmap == dict(foo="bar", baz="spam", ham="end end")
 
-        # test a malformed file
+        # Test a malformed file.
         testfile = os.path.join(tmpdir, "bar.iwm")
         with open(testfile, "w") as f:
             f.write("# This is a malformed interwiki file\n" "fails # ever")
         with pytest.raises(ValueError):
             InterWikiMap.from_file(testfile)
 
-        # finally destroy everything
+        # Clean up temporary directory.
         shutil.rmtree(tmpdir)
 
     def test_load_string(self):
         """
-        Test that InterWikiMap.from_unicode correctly loads unicode objects.
+        Test that InterWikiMap.from_string correctly loads string objects.
         """
-        # test for void wiki maps
+        # Test empty wiki maps.
         assert InterWikiMap.from_string("").iwmap == dict()
         assert InterWikiMap.from_string("#spam\r\n").iwmap == dict()
-        # test for comments
+        # Test comments.
         s = (
             "# foo bar\n"
             "#spamham\r\n"
@@ -266,10 +266,10 @@ def test_load_string(self):
             "ham spam # this is a valid description"
         )
         assert InterWikiMap.from_string(s).iwmap == dict(foo="bar", ham="spam")
-        # test for valid strings
+        # Test valid strings.
         s = "link1 http://link1.com/\r\n" "link2 http://link2.in/\r\n"
         assert InterWikiMap.from_string(s).iwmap == dict(link1="http://link1.com/", link2="http://link2.in/")
-        # test invalid strings
+        # Test invalid strings.
         with pytest.raises(ValueError):
             InterWikiMap.from_string("foobarbaz")
 
diff --git a/src/moin/utils/_tests/test_iri.py b/src/moin/utils/_tests/test_iri.py
index 281a09709..36d0b9eb9 100644
--- a/src/moin/utils/_tests/test_iri.py
+++ b/src/moin/utils/_tests/test_iri.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.utils.iri
+MoinMoin - tests for moin.utils.iri.
 """
 
 
diff --git a/src/moin/utils/_tests/test_mime.py b/src/moin/utils/_tests/test_mime.py
index 4675effeb..09076c8f1 100644
--- a/src/moin/utils/_tests/test_mime.py
+++ b/src/moin/utils/_tests/test_mime.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.utils.mime
+MoinMoin - moin.utils.mime tests.
 """
 
 
diff --git a/src/moin/utils/_tests/test_mimetype.py b/src/moin/utils/_tests/test_mimetype.py
index 474525892..6f997a531 100644
--- a/src/moin/utils/_tests/test_mimetype.py
+++ b/src/moin/utils/_tests/test_mimetype.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - moin.utils.mimetype Tests
+MoinMoin - moin.utils.mimetype tests.
 """
 
 
@@ -10,7 +10,7 @@
 
 
 class TestMimeType:
-    """Test: utils.mimetype"""
+    """Tests for moin.utils.mimetype."""
 
     def test_parse_format(self):
         MimeType_obj = mimetype.MimeType(filename="test_file.jpg")
diff --git a/src/moin/utils/_tests/test_notifications.py b/src/moin/utils/_tests/test_notifications.py
index 747497050..88cdfee9b 100644
--- a/src/moin/utils/_tests/test_notifications.py
+++ b/src/moin/utils/_tests/test_notifications.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.utils.notifications Tests
+MoinMoin - tests for moin.utils.notifications.
 """
 
 from io import BytesIO
diff --git a/src/moin/utils/_tests/test_paramparser.py b/src/moin/utils/_tests/test_paramparser.py
index 883a3b4da..616b101e1 100644
--- a/src/moin/utils/_tests/test_paramparser.py
+++ b/src/moin/utils/_tests/test_paramparser.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.utils.paramparser Tests
+MoinMoin - tests for moin.utils.paramparser.
 """
 
 
diff --git a/src/moin/utils/_tests/test_pysupport.py b/src/moin/utils/_tests/test_pysupport.py
index 29be131a1..88b0f66a7 100644
--- a/src/moin/utils/_tests/test_pysupport.py
+++ b/src/moin/utils/_tests/test_pysupport.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.utils.pysupport Tests
+MoinMoin - tests for moin.utils.pysupport.
 """
 
 
@@ -19,10 +19,9 @@
 
 
 class TestImportNameFromMoin:
-    """Test importName of MoinMoin modules
+    """Tests importName for MoinMoin modules.
 
-    We don't make any testing for files, assuming that moin package is
-    not broken.
+    We do not test files here, assuming that the moin package is not broken.
     """
 
     def testNonExistingModule(self):
@@ -30,7 +29,7 @@ def testNonExistingModule(self):
         pytest.raises(ImportError, pysupport.importName, "moin.utils.nonexistent", "importName")
 
     def testNonExistingAttribute(self):
-        """pysupport: import nonexistent attritbue raises AttributeError"""
+        """pysupport: import nonexistent attribute raises AttributeError"""
         pytest.raises(AttributeError, pysupport.importName, "moin.utils.pysupport", "nonexistent")
 
     def testExisting(self):
@@ -69,7 +68,7 @@ class TestImportNonExisting(TestImportNameFromPlugin):
     plugin = "NonExistingWikiPlugin"
 
     def testNonExisting(self):
-        """pysupport: import nonexistent wiki plugin fail"""
+        """pysupport: import nonexistent wiki plugin fails"""
         if self.pluginExists():
             pytest.skip(f"plugin exists: {self.plugin}")
         pytest.raises(plugins.PluginMissingError, plugins.importWikiPlugin, app.cfg, "parser", self.plugin, "Parser")
@@ -83,11 +82,10 @@ class TestImportExisting(TestImportNameFromPlugin):
     def testExisting(self):
         """pysupport: import existing wiki plugin
 
-        Tests if a module can be imported from an arbitrary path
-        like it is done in moin for plugins. Some strange bug
-        in the old implementation failed on an import of os,
-        cause os does a from os.path import that will stumble
-        over a poisoned sys.modules.
+        Tests whether a module can be imported from an arbitrary path,
+        as done in moin for plugins. A bug in the old implementation
+        failed on an import of os because os performs a 'from os.path import',
+        which would stumble over a poisoned sys.modules.
         """
         try:
             self.createTestPlugin()
@@ -100,7 +98,7 @@ def testExisting(self):
             self.deleteTestPlugin()
 
     def createTestPlugin(self):
-        """Create test plugin, skiping if plugin exists"""
+        """Create test plugin, skipping if plugin exists"""
         if self.pluginExists():
             self.shouldDeleteTestPlugin = False
             pytest.skip(f"Won't overwrite existing plugin: {self.plugin}")
@@ -121,7 +119,7 @@ class Parser:
             pytest.skip(f"Can't create test plugin: {err!s}")
 
     def deleteTestPlugin(self):
-        """Delete plugin files ignoring missing files errors"""
+        """Delete plugin files, ignoring missing-file errors"""
         if not self.shouldDeleteTestPlugin:
             return
         for suffix in (".py", ".pyc"):
diff --git a/src/moin/utils/_tests/test_registry.py b/src/moin/utils/_tests/test_registry.py
index e63b50c08..3b803baec 100644
--- a/src/moin/utils/_tests/test_registry.py
+++ b/src/moin/utils/_tests/test_registry.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.utils.registry
+MoinMoin - moin.utils.registry tests.
 """
 
 
diff --git a/src/moin/utils/_tests/test_send_file.py b/src/moin/utils/_tests/test_send_file.py
index 02573cf3b..c2de4f9bc 100644
--- a/src/moin/utils/_tests/test_send_file.py
+++ b/src/moin/utils/_tests/test_send_file.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - moin.utils.send_file Tests
+MoinMoin - moin.utils.send_file tests.
 """
 
 import os
@@ -15,7 +15,7 @@
 
 
 class TestFuid:
-    """test for send_file"""
+    """Tests for moin.utils.send_file."""
 
     def setup_method(self, method):
         self.test_dir = tempfile.mkdtemp("", "test_dir")
diff --git a/src/moin/utils/_tests/test_show_time.py b/src/moin/utils/_tests/test_show_time.py
index a22c48eaa..fa7f0c40e 100644
--- a/src/moin/utils/_tests/test_show_time.py
+++ b/src/moin/utils/_tests/test_show_time.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - test moin.utils.show_time
+MoinMoin - tests for moin.utils.show_time.
 """
 from flask import g as flaskg
 
@@ -12,7 +12,7 @@
 class TestShowTime:
 
     def test_showTime_duration(self):
-        """test somewhat arbitrary duration results"""
+        """Test somewhat arbitrary duration results."""
         seconds_expected = (
             (25, ("seconds", 25)),
             (89, ("seconds", 89)),
@@ -32,7 +32,7 @@ def test_showTime_duration(self):
             assert result == expected
 
     def test_show_time_datetime(self):
-        """users who are not logged-in get ISO 8601 Zulu dates"""
+        """Users who are not logged in get ISO 8601 Zulu dates."""
         formatted_date = show_time.format_date(utc_dt=0)
         assert formatted_date == "1970-01-01z"
         formatted_time = show_time.format_time(utc_dt=0)
@@ -41,7 +41,7 @@ def test_show_time_datetime(self):
         assert formatted_date_time == "1970-01-01 00:00:00z"
 
     def test_show_time_datetime_logged_in_utc(self):
-        """users who are logged-in, selected UTC timezone and checked ISO-8601 get ISO 8601 Zulu dates"""
+        """Users who are logged in, selected the UTC time zone, and enabled ISO 8601 get ISO 8601 Zulu dates."""
         flaskg.user.valid = True
         flaskg.user.timezone = "UTC"
         flaskg.user.locale = "en"
@@ -54,7 +54,7 @@ def test_show_time_datetime_logged_in_utc(self):
         assert formatted_date_time == "1970-01-01 00:00:00z"
 
     def test_show_time_datetime_logged_in_local(self):
-        """users who are logged-in, unchecked ISO-8601 get dates based on locale and timezone"""
+        """Users who are logged in with ISO 8601 disabled get dates based on locale and time zone."""
         flaskg.user.valid = True
         flaskg.user.locale = "en"
         flaskg.user.iso_8601 = False
@@ -62,9 +62,15 @@ def test_show_time_datetime_logged_in_local(self):
         formatted_date = show_time.format_date(utc_dt=0)
         assert formatted_date == "Dec 31, 1969"
         formatted_time = show_time.format_time(utc_dt=0)
-        assert formatted_time in ["5:00:00\u202fPM", "5:00:00 PM"]  # TODO: 2nd string can be removed in future
+        assert formatted_time in [
+            "5:00:00\u202fPM",
+            "5:00:00 PM",
+        ]  # TODO: The second string can be removed in the future
         formatted_date_time = show_time.format_date_time(utc_dt=0)
-        assert formatted_date_time in ["Dec 31, 1969, 5:00:00\u202fPM", "Dec 31, 1969, 5:00:00 PM"]  # TODO: ditto
+        assert formatted_date_time in [
+            "Dec 31, 1969, 5:00:00\u202fPM",
+            "Dec 31, 1969, 5:00:00 PM",
+        ]  # TODO: Same as above
 
 
 coverage_modules = ["moin.utils.show_time"]
diff --git a/src/moin/utils/_tests/test_subscriptions.py b/src/moin/utils/_tests/test_subscriptions.py
index b6b0c48ce..3a73c7b78 100644
--- a/src/moin/utils/_tests/test_subscriptions.py
+++ b/src/moin/utils/_tests/test_subscriptions.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.utils.subscriptions Tests
+MoinMoin - tests for moin.utils.subscriptions.
 """
 
 import pytest
@@ -104,7 +104,7 @@ def test_get_matched_subscription_patterns(self, item, namespace):
         assert patterns == matching_patterns
 
     def test_perf_get_subscribers(self):
-        pytest.skip("usually we do no performance tests")
+        pytest.skip("Usually we do not run performance tests.")
         password = "password"
         subscriptions = [
             f"{ITEMID}:{self.item.meta[ITEMID]}",
diff --git a/src/moin/utils/_tests/test_thread_monitor.py b/src/moin/utils/_tests/test_thread_monitor.py
index 280708940..a8bd8dc6b 100644
--- a/src/moin/utils/_tests/test_thread_monitor.py
+++ b/src/moin/utils/_tests/test_thread_monitor.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - moin.utils.thread_monitor Tests
+MoinMoin - moin.utils.thread_monitor tests.
 """
 
 import shutil
@@ -13,7 +13,7 @@
 
 
 class TestMonitor:
-    """Tests: Monitor"""
+    """Tests for Monitor."""
 
     def setup_method(self, method):
         self.test_dir = tempfile.mkdtemp("", "test_dump")
@@ -23,23 +23,23 @@ def teardown_method(self, method):
         shutil.rmtree(self.test_dir)
 
     def test_hook(self):
-        """tests for hooks"""
+        """Tests for hooks."""
         Monitor_test_obj = Monitor()
         result_inactivated = Monitor_test_obj.hook_enabled()
         assert not result_inactivated
-        # activate the hook
+        # Activate the hook.
         Monitor_test_obj.activate_hook()
         result_activated = Monitor_test_obj.hook_enabled()
         assert result_activated
 
     def test_trigger_dump(self):
-        """test for trigger_dump"""
+        """Test for trigger_dump."""
         Monitor_test_obj = Monitor()
         # activate the hook first
         Monitor_test_obj.activate_hook()
         with open(self.src, "w") as f:
             Monitor_test_obj.trigger_dump(f)
-        # read the content of first line
+        # Read the first line of content.
         with open(self.src) as f:
             f.readline()
             assert "Dumping thread" in f.readline()
diff --git a/src/moin/utils/_tests/test_tree.py b/src/moin/utils/_tests/test_tree.py
index 814b82f43..6af03da51 100644
--- a/src/moin/utils/_tests/test_tree.py
+++ b/src/moin/utils/_tests/test_tree.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tests for moin.utils.tree
+MoinMoin - moin.utils.tree tests.
 """
 
 from emeraldtree import ElementTree as ET
diff --git a/src/moin/utils/_tests/test_util.py b/src/moin/utils/_tests/test_util.py
index 7fcad1e37..f0f3872aa 100644
--- a/src/moin/utils/_tests/test_util.py
+++ b/src/moin/utils/_tests/test_util.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - moin.utils Tests
+MoinMoin - tests for moin.utils.
 """
 
 
@@ -12,7 +12,7 @@
 class TestUtil:
 
     def testRangeList(self):
-        """utils.rangelist: test correct function for misc. input values"""
+        """utils.rangelist: test correct behavior for various input values"""
         result = utils.rangelist([])
         expected = ""
         assert result == expected, 'Expected "%(expected)s" but got "%(result)s"' % locals()
diff --git a/src/moin/utils/clock.py b/src/moin/utils/clock.py
index 2b687778a..16accf66e 100644
--- a/src/moin/utils/clock.py
+++ b/src/moin/utils/clock.py
@@ -4,7 +4,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - Clock
+MoinMoin - clock utilities.
 """
 
 
@@ -24,14 +24,14 @@ class Clock:
 
     Usage:
         flaskg.clock.start("mytimer")
-        # do something
-        flaskg.clock.stop("mytimer", comment="add this to the log message")
-        # the optional comment field is added to the log message
-        # or if you want to use its value later
+        # Do something
+        flaskg.clock.stop("mytimer", comment="Adds this to the log message")
+        # The optional comment is appended to the log message.
+        # Or, if you want to use its value later:
         timerval = flaskg.clock.stop("mytimer")
 
-    Starting a timer multiple times is supported but the
-    one started last has to be stopped first.
+    Starting a timer multiple times is supported, but the
+    one started last must be stopped first.
     """
 
     def __init__(self):
diff --git a/src/moin/utils/crypto.py b/src/moin/utils/crypto.py
index 7cc17a7e0..7efe95930 100644
--- a/src/moin/utils/crypto.py
+++ b/src/moin/utils/crypto.py
@@ -2,13 +2,12 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Cryptographic and random functions
+MoinMoin - cryptographic and random functions.
 
 Features:
-
-- generate password recovery tokens
-- verify password recovery tokens
-- generate random strings of given length (for salting)
+- Generate password-recovery tokens
+- Verify password-recovery tokens
+- Generate random strings of a given length (for salting)
 """
 
 import hashlib
@@ -32,13 +31,13 @@ def make_uuid():
 
 def random_string(length, allowed_chars=None):
     """
-    Generate a random string with given length consisting of the given characters.
+    Generate a random string of the given length consisting of the given characters.
 
-    Note: this is now just a little wrapper around passlib's randomness code.
+    Note: this is now just a small wrapper around Passlib's randomness code.
 
-    :param length: length of the str
-    :param allowed_chars: str with allowed characters
-    :returns: random string
+    :param length: Length of the string.
+    :param allowed_chars: String of allowed characters.
+    :returns: Random string.
     """
     assert allowed_chars is not None
     s = getrandstr(rng, allowed_chars, length)
@@ -50,23 +49,23 @@ def random_string(length, allowed_chars=None):
 
 def generate_token(key=None, stamp=None):
     """
-    generate a pair of a secret key and a crypto token.
+    Generate a pair consisting of a secret key and a token.
 
-    you can use this to implement a password recovery functionality by
-    calling generate_token() and transmitting the returned token to the
-    (correct) user (e.g. by email) and storing the returned (secret) key
-    into the user's profile on the server side.
+    You can use this to implement password-recovery functionality by
+    calling generate_token(), transmitting the returned token to the
+    correct user (e.g., by email), and storing the returned (secret) key
+    in the user's profile on the server side.
 
-    after the user received the token, he returns to the wiki, gives his
-    user name or email address and the token he received. read the (secret)
+    After the user receives the token, they return to the wiki, enter their
+    user name or email address, and the token they received. Read the (secret)
     key from the user profile and call valid_token(key, token) to verify
-    if the token is valid. if it is, consider the user authenticated, remove
-    the secret key from his profile and let him reset his password.
+    whether the token is valid. If it is valid, consider the user authenticated,
+    remove the secret key from their profile, and allow them to reset the password.
 
-    :param key: give it to recompute some specific token for verification
-    :param stamp: give it to recompute some specific token for verification
+    :param key: Recompute a specific token for verification using this key.
+    :param stamp: Recompute a specific token for verification using this timestamp.
     :rtype: 2-tuple
-    :returns: key, token (both unicode)
+    :returns: key, token (both strings)
     """
     if key is None:
         key = genword(length=32)
@@ -81,14 +80,14 @@ def generate_token(key=None, stamp=None):
 
 def valid_token(key, token, timeout=2 * 60 * 60):
     """
-    check if token is valid with respect to the secret key,
-    the token must not be older than timeout seconds.
+    Check whether a token is valid with respect to the secret key.
+    The token must not be older than the timeout (in seconds).
 
-    :param key: give the secret key to verify the token
-    :param token: the token to verify
-    :param timeout: timeout seconds, set to None to ignore timeout
+    :param key: The secret key to verify the token.
+    :param token: The token to verify.
+    :param timeout: Timeout in seconds; set to None to ignore the timeout.
     :rtype: bool
-    :returns: token is valid and not timed out
+    :returns: True if the token is valid and not timed out; otherwise False.
     """
     parts = token.split("-")
     if len(parts) != 2:
@@ -108,14 +107,14 @@ def valid_token(key, token, timeout=2 * 60 * 60):
 
 def cache_key(**kw):
     """
-    Calculate a cache key (ascii only)
+    Calculate a cache key (ASCII only).
 
     Important key properties:
 
-    * The key must be different for different <kw>.
-    * Key is pure ascii
+    * The key must be different for different kw.
+    * The key is pure ASCII.
 
-    :param kw: keys/values to compute cache key from
+    :param kw: Keys/values to compute the cache key from.
     """
     return hashlib.md5(repr(kw).encode(), usedforsecurity=False).hexdigest()
 
diff --git a/src/moin/utils/diff3.py b/src/moin/utils/diff3.py
index 94c9410b4..91b86b195 100644
--- a/src/moin/utils/diff3.py
+++ b/src/moin/utils/diff3.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - diff3 algorithm
+MoinMoin - diff3 algorithm.
 """
 
 
@@ -10,14 +10,15 @@
 
 
 def text_merge(old, other, new, allow_conflicts=1, *markers):
-    """do line by line diff3 merge with three strings"""
+    """Do a line-by-line diff3 merge with three strings."""
     result = merge(old.splitlines(1), other.splitlines(1), new.splitlines(1), allow_conflicts, *markers)
     return "".join(result)
 
 
 def merge(old, other, new, allow_conflicts=1, *markers):
-    """do line by line diff3 merge
-    input must be lists containing single lines
+    """Do a line-by-line diff3 merge.
+
+    Input must be lists containing single lines.
     """
     if not markers:
         markers = default_markers
@@ -124,8 +125,9 @@ def merge(old, other, new, allow_conflicts=1, *markers):
 
 
 def tripple_match(old, other, new, other_match, new_match):
-    """find next matching pattern unchanged in both other and new
-    return the position in all three lists
+    """Find the next matching pattern unchanged in both 'other' and 'new'.
+
+    Return the positions in all three lists.
     """
     while True:
         difference = new_match[0] - other_match[0]
@@ -151,8 +153,9 @@ def tripple_match(old, other, new, other_match, new_match):
 
 
 def match(list1, list2, nr1, nr2, maxcount=3):
-    """return the number matching items after the given positions
-    maximum maxcount lines are are processed
+    """Return the number of matching items after the given positions.
+
+    At most 'maxcount' lines are processed.
     """
     i = 0
     len1 = len(list1)
@@ -167,8 +170,9 @@ def match(list1, list2, nr1, nr2, maxcount=3):
 
 
 def find_match(list1, list2, nr1, nr2, mincount=3):
-    """searches next matching pattern with lenght mincount
-    if no pattern is found len of the both lists is returned
+    """Search the next matching pattern with length 'mincount'.
+
+    If no pattern is found, the lengths of both lists are returned.
     """
     len1 = len(list1)
     len2 = len(list2)
diff --git a/src/moin/utils/diff_datastruct.py b/src/moin/utils/diff_datastruct.py
index 2256c6e97..5192e69fc 100644
--- a/src/moin/utils/diff_datastruct.py
+++ b/src/moin/utils/diff_datastruct.py
@@ -10,18 +10,18 @@
 
 
 class UndefinedType:
-    """Represents a non-existing value"""
+    """Represents a non-existing value."""
 
 
 Undefined = UndefinedType()
 
 
 def diff(d1, d2, basekeys=None):
-    """Get the diff of 2 datastructures (usually 2 meta dicts)
+    """Get the diff of two data structures (usually two meta dicts).
 
-    :param d1: old datastructure
-    :param d2: new datastructure
-    :param basekeys: list of data keys' basenames (default: None, meaning [])
+    :param d1: old data structure
+    :param d2: new data structure
+    :param basekeys: list of data keys' base names (default: None, meaning [])
     :return: a list of tuples of the format (<change type>, <basekeys>, <value>)
              that can be used to format a diff
     """
diff --git a/src/moin/utils/diff_html.py b/src/moin/utils/diff_html.py
index a82b55ed3..1776b28cd 100644
--- a/src/moin/utils/diff_html.py
+++ b/src/moin/utils/diff_html.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - Side by side diffs
+MoinMoin - side-by-side HTML diffs.
 """
 
 
@@ -27,7 +27,7 @@ def indent(line):
 # This code originally by Scott Moonen, used with permission.
 def diff(old, new):
     """Find changes between old and new and return
-    HTML markup visualising them.
+    HTML markup visualizing them.
 
     :param old: old text [unicode]
     :param new: new text [unicode]
diff --git a/src/moin/utils/diff_text.py b/src/moin/utils/diff_text.py
index c19bc703e..5a097c984 100644
--- a/src/moin/utils/diff_text.py
+++ b/src/moin/utils/diff_text.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - simple text diff (uses difflib)
+MoinMoin - simple text diff (uses difflib).
 """
 
 
@@ -13,11 +13,11 @@ def diff(oldlines, newlines, **kw):
     """
     Find changes between oldlines and newlines.
 
-    :param oldlines: list of old text lines
-    :param newlines: list of new text lines
-    :keyword ignorews: if 1: ignore whitespace
+    :param oldlines: List of old text lines.
+    :param newlines: List of new text lines.
+    :keyword ignorews: If 1, ignore whitespace.
     :rtype: list
-    :returns: lines like diff tool does output.
+    :returns: Lines like the diff tool outputs.
     """
     false = lambda s: None  # noqa
     if kw.get("ignorews", 0):
@@ -27,7 +27,7 @@ def diff(oldlines, newlines, **kw):
 
     lines = list(d.compare(oldlines, newlines))
 
-    # return empty list if there were no changes
+    # Return an empty list if there were no changes
     changed = 0
     for line in lines:
         if line[0] != " ":
@@ -41,7 +41,7 @@ def diff(oldlines, newlines, **kw):
     #            lines = [line for line in lines if line[0] != '?']
     #        return lines
 
-    # calculate the hunks and remove the unchanged lines between them
+    # Calculate the hunks and remove the unchanged lines between them
     i = 0  # actual index in lines
     count = 0  # number of unchanged lines
     lcount_old = 0  # line count old file
@@ -73,7 +73,7 @@ def diff(oldlines, newlines, **kw):
         elif marker == "?":
             lines[i : i + 1] = []
 
-    # remove unchanged lines a the end
+    # Remove unchanged lines at the end
     if count > 3:
         lines[-count + 3 :] = []
 
diff --git a/src/moin/utils/edit_locking.py b/src/moin/utils/edit_locking.py
index 011ebd027..f16d0db1b 100644
--- a/src/moin/utils/edit_locking.py
+++ b/src/moin/utils/edit_locking.py
@@ -3,31 +3,31 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-Create sqlite3 data models for edit locking and saving drafts. Expected usage
+Create SQLite3 data models for edit locking and saving drafts. Expected usage
 is limited to the +modify method in /items/__init__.py for text items.
 
-Moin2 has only two states for the edit_locking_Policy: None and 'lock'.
-None is suitable for single user desktop wikis.
+Moin2 has only two states for the edit_locking_policy: None and 'lock'.
+None is suitable for single-user desktop wikis.
 
 Drafts are always saved when an editor clicks the Preview link.
 Regardless of the edit_locking_policy, warning messages are given to the
 user when conflicts occur. Conflicts are caused when a user's edit lock times
 out, a second user obtains the item's edit lock and saves the item with updates, and then
 the first editor saves the item with conflicting updates. Such instances are
-detected and warning messages are flashed and included in the saved item.
+detected, and warning messages are flashed and included in the saved item.
 
-There are two small tables within the db saved in /wiki/sql/:
-    * editlock - maintains state of edit locks on text items when the locking policy is lock.
-        * there will be 1 row for each text item being actively edited or abandoned without a Save or Cancel
-        * rows for abandoned edits will be reused if a second user edits the item
-    * editdraft - saves pointers to text draft when user clicks the Preview button
-        * there will be 1 row per user who has clicked Modify and has not yet Saved or Cancelled
-        * if a user clicks Preview while editing a second item, the users old draft will be
-          deleted and the row reused to point to the new draft
+There are two small tables within the DB saved in /wiki/sql/:
+    * editlock - Maintains the state of edit locks on text items when the locking policy is 'lock'.
+        * There will be 1 row for each text item being actively edited or abandoned without a Save or Cancel.
+        * Rows for abandoned edits will be reused if a second user edits the item.
+    * editdraft - Saves pointers to a text draft when a user clicks the Preview button.
+        * There will be 1 row per user who has clicked Modify and has not yet Saved or Cancelled.
+        * If a user clicks Preview while editing a second item, the user's old draft will be
+          deleted and the row reused to point to the new draft.
 
 The preview drafts are saved in the /wiki/preview/ directory.
 
-To stress test edit locking use the Locust based tests in /contrib/loadtesting/.
+To stress-test edit locking, use the Locust-based tests in /contrib/loadtesting/.
 """
 
 import os
@@ -49,7 +49,7 @@
 logging = log.getLogger(__name__)
 
 
-# these are used to create paths to the sql database and saved drafts
+# These are used to create paths to the SQL database and saved drafts
 SQL = "sql"
 DB_NAME = "edit_utils.db"
 PREVIEW = "preview"
diff --git a/src/moin/utils/filesys.py b/src/moin/utils/filesys.py
index 11cc8d750..1f8f5d973 100644
--- a/src/moin/utils/filesys.py
+++ b/src/moin/utils/filesys.py
@@ -4,7 +4,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - File System Utilities
+MoinMoin - File system utilities.
 """
 
 
@@ -29,7 +29,7 @@
 
 
 def chmod(name, mode, catchexception=True):
-    """change mode of some file/dir on platforms that support it."""
+    """Change the mode of a file/dir on platforms that support it."""
     try:
         os.chmod(name, mode)
     except OSError:
@@ -41,10 +41,10 @@ def chmod(name, mode, catchexception=True):
 
 
 def rename_no_overwrite(oldname, newname, delete_old=False):
-    """Multiplatform rename
+    """Multiplatform rename.
 
-    This kind of rename is doing things differently: it fails if newname
-    already exists. This is the usual thing on win32, but not on posix.
+    This kind of rename behaves differently: it fails if newname
+    already exists. This is the usual behavior on Windows, but not on POSIX.
 
     If delete_old is True, oldname is removed in any case (even if the
     rename did not succeed).
@@ -102,9 +102,11 @@ def touch(name):
 
 
 def access_denied_decorator(fn):
-    """Due to unknown reasons, some os.* functions on Win32 sometimes fail
+    """Retry certain OS calls when transient access-denied errors occur (Windows).
+
+    Due to unknown reasons, some os.* functions on Windows sometimes fail
     with Access Denied (although access should be possible).
-    Just retrying it a bit later works and this is what we do.
+    Retrying shortly often works; this decorator does that.
     """
     if sys.platform == "win32":
 
@@ -164,7 +166,7 @@ def copytree(src, dst, symlinks=False):
     it is false, the contents of the files pointed to by symbolic
     links are copied.
 
-    In contrary to shutil.copytree, this version also copies directory
+    In contrast to shutil.copytree, this version also copies directory
     stats, not only file stats.
 
     """
@@ -191,6 +193,6 @@ def copytree(src, dst, symlinks=False):
 
 
 def wiki_index_exists():
-    """Return true if a wiki index exists."""
+    """Return True if a wiki index exists."""
     logging.debug("CWD: %s", os.getcwd())
     return bool(glob("wiki/index/_all_revs_*.toc"))
diff --git a/src/moin/utils/forms.py b/src/moin/utils/forms.py
index 453a9a931..17d5a036c 100644
--- a/src/moin/utils/forms.py
+++ b/src/moin/utils/forms.py
@@ -2,7 +2,7 @@
 # License: see flatland license
 
 """
-    MoinMoin - form helpers for flatland / jinja2
+MoinMoin - form helpers for Flatland/Jinja2.
 """
 
 
@@ -73,10 +73,10 @@ def placeholder_filter(tagname, attributes, contents, context, bind):
 
 
 def error_filter_factory(class_="moin-error"):
-    """Returns an HTML generation filter annotating field CSS class on error.
+    """Return an HTML-generation filter that annotates a field’s CSS class on error.
 
-    :param class: The css class to apply in case of validation error on a
-                  field.  Default: 'error'
+    :param class_: The CSS class to apply in case of a validation error on a
+                   field. Default: 'moin-error'
     """
 
     def error_filter(tagname, attributes, contents, context, bind):
@@ -95,7 +95,7 @@ def error_filter(tagname, attributes, contents, context, bind):
 
 
 def make_generator():
-    """make an html generator"""
+    """Make an HTML generator."""
     return Generator(
         auto_domid=True,
         auto_for=True,
diff --git a/src/moin/utils/interwiki.py b/src/moin/utils/interwiki.py
index d97fa0fa2..6b54b4364 100644
--- a/src/moin/utils/interwiki.py
+++ b/src/moin/utils/interwiki.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - interwiki support code
+MoinMoin - interwiki support code.
 """
 
 from __future__ import annotations
@@ -28,14 +28,14 @@
 
 def is_local_wiki(wiki_name):
     """
-    check if <wiki_name> is THIS wiki
+    Check if <wiki_name> is this wiki.
     """
     return wiki_name in ["", "Self", app.cfg.interwikiname]
 
 
 def is_known_wiki(wiki_name):
     """
-    check if <wiki_name> is a known wiki name
+    Check if <wiki_name> is a known wiki name.
 
     Note: interwiki_map should have entries for the special wikinames
     denoting THIS wiki, so we do not need to check these names separately.
@@ -45,8 +45,8 @@ def is_known_wiki(wiki_name):
 
 def get_fqname(item_name: str, field: LiteralString, namespace: str):
     """
-    Compute composite name from item_name, field, namespace
-    composite name == [NAMESPACE/][@FIELD/]NAME
+    Compute a composite name from item_name, field, and namespace.
+    Composite name == [NAMESPACE/][@FIELD/]NAME
     """
     if field and field != NAME_EXACT:
         item_name = f"@{field}/{item_name}"
@@ -69,9 +69,9 @@ def url_for_item(
     Compute URL for some local or remote/interwiki item.
 
     For local items:
-    give <rev> to get the url of some specific revision.
-    give the <endpoint> to get the url of some specific view,
-    give _external=True to compute fully specified URLs.
+    Give <rev> to get the URL of a specific revision.
+    Give <endpoint> to get the URL of a specific view,
+    and give _external=True to compute fully specified URLs.
 
     For remote/interwiki items:
     If you just give <item_name> and <wiki_name>, a generic interwiki URL
@@ -123,7 +123,7 @@ def url_for_item(
 
 def get_download_file_name(fqname):
     """
-    returns the filename that is used for downloading items
+    Return the filename used for downloading items.
     """
     if fqname.field == NAME_EXACT:
         return fqname.value
@@ -134,16 +134,16 @@ def get_download_file_name(fqname):
 def _split_namespace(namespaces, url):
     """
     Find the longest namespace in the set.
-    the namespaces are separated by  slashes (/).
+    Namespaces are separated by slashes (/).
     Example:
-        namespaces_set(['ns1', 'ns1/ns2'])
-        url: ns1/urlalasd return: ns1, urlalasd
-        url: ns3/urlalasd return: '', ns3/urlalasd
-        url: ns2/urlalasd return: '', ns2/urlalasd
-        url: ns1/ns2/urlalasd return: ns1/ns2, urlalasd
-    param namespaces_set: set of namespaces (strings) to search
-    param url: string
-    returns: (namespace, url)
+        namespaces: ['ns1', 'ns1/ns2']
+        url: ns1/urlalasd -> ns1, urlalasd
+        url: ns3/urlalasd -> '', ns3/urlalasd
+        url: ns2/urlalasd -> '', ns2/urlalasd
+        url: ns1/ns2/urlalasd -> ns1/ns2, urlalasd
+    :param namespaces: set of namespaces (strings) to search
+    :param url: string
+    :return: (namespace, url)
     """
     namespace = ""
     tokens_list = url.split("/")
@@ -162,13 +162,13 @@ def _split_namespace(namespaces, url):
 
 class CompositeName(namedtuple("CompositeName", "namespace, field, value")):
     """
-    namedtuple to hold the compositename
+    Named tuple to hold the composite name.
     """
 
     @property
     def split(self):
         """
-        returns a dict of field_names/field_values
+        Return a dict of field names/values.
         """
         return {NAMESPACE: self.namespace, "field": self.field, "item_name": self.value}
 
@@ -182,8 +182,8 @@ def __str__(self):
     @property
     def query(self):
         """
-        returns a dict that can be used as a whoosh query
-        to lookup index documents matching this CompositeName
+        Return a dict that can be used as a Whoosh query
+        to look up index documents matching this CompositeName.
         """
         field = NAME_EXACT if not self.field else self.field
         return {NAMESPACE: self.namespace, field: self.value}
@@ -198,11 +198,11 @@ def get_root_fqname(self):
 
 def split_fqname(url: str) -> CompositeName:
     """
-    Split a fully qualified url into namespace, field and pagename
-    url -> [NAMESPACE/][@FIELD/]NAME
+    Split a fully qualified URL into namespace, field, and page name.
+    URL -> [NAMESPACE/][@FIELD/]NAME
 
-    :param url: the url to split
-    :returns: a namedtuple CompositeName(namespace, field, itemname)
+    :param url: the URL to split
+    :returns: a namedtuple CompositeName(namespace, field, item_name)
     Examples::
 
         url: 'ns1/ns2/@itemid/Page' return 'ns1/ns2', 'itemid', 'Page'
@@ -225,7 +225,7 @@ def split_fqname(url: str) -> CompositeName:
 
 def split_interwiki(wikiurl):
     """
-    Split a interwiki name, into wikiname and pagename, e.g::
+    Split an interwiki name into wiki name and page name, e.g.::
 
         'MoinMoin/FrontPage' -> "MoinMoin", "", "", "FrontPage"
         'FrontPage' -> "Self", "", "", "FrontPage"
@@ -271,10 +271,10 @@ def split_interwiki(wikiurl):
 
 def join_wiki(wikiurl, wikitail, field, namespace):
     """
-    Add a (url_quoted) page name to an interwiki url.
+    Add a (URL-quoted) page name to an interwiki URL.
 
     Note: We can't know what kind of URL quoting a remote wiki expects.
-          We just use a utf-8 encoded string with standard URL quoting.
+          We just use a UTF-8 encoded string with standard URL quoting.
 
     :param wikiurl: wiki url, maybe including a $PAGE placeholder
     :param wikitail: page name
@@ -311,9 +311,9 @@ def getInterwikiHome(username):
     """
     Get a user's homepage.
 
-    cfg.user_homewiki influences behaviour of this:
-    'Self' does mean we store user homepage in THIS wiki.
-    When set to our own interwikiname, it behaves like with 'Self'.
+    cfg.user_homewiki influences behavior:
+    'Self' means we store user homepages in this wiki.
+    When set to our own interwiki name, it behaves like 'Self'.
 
     'SomeOtherWiki' means we store user homepages in another wiki.
 
diff --git a/src/moin/utils/iri.py b/src/moin/utils/iri.py
index 03c49de8d..0f37bc06d 100644
--- a/src/moin/utils/iri.py
+++ b/src/moin/utils/iri.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Generic? IRI implementation
+MoinMoin - Generic IRI implementation.
 
 Implements the generic IRI form as defined in RFC 3987.
 """
@@ -17,7 +17,7 @@
 
 def _iriquote_replace(exc):
     """
-    Special replace function that implements the IRI quoting rules
+    Special replace function that implements the IRI quoting rules.
     """
     if not isinstance(exc, UnicodeDecodeError):
         raise exc
diff --git a/src/moin/utils/mime.py b/src/moin/utils/mime.py
index dd308be61..d204a4303 100644
--- a/src/moin/utils/mime.py
+++ b/src/moin/utils/mime.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - MIME helpers
+MoinMoin — MIME helpers.
 """
 
 
@@ -97,12 +97,12 @@ def _parse(cls, type):
 
     def issupertype(self, other):
         """
-        Check if this object is a super type of the other
+        Check if this object is a supertype of the other.
 
-        A super type is defined as
+        A supertype is defined as
         - the other type matches this (possibly wildcard) type,
-        - the other subtype matches this (possibly wildcard) subtype and
-        - the other parameters are a supperset of this one.
+        - the other subtype matches this (possibly wildcard) subtype, and
+        - the other parameters are a superset of this one.
         """
         if isinstance(other, Type):
             if self.type and self.type != other.type:
diff --git a/src/moin/utils/mimetype.py b/src/moin/utils/mimetype.py
index 8829f19ae..9b94b6d5c 100644
--- a/src/moin/utils/mimetype.py
+++ b/src/moin/utils/mimetype.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - mimetype support
+MoinMoin - MIME type support.
 """
 
 import mimetypes
@@ -12,8 +12,8 @@
 
 from moin.constants.contenttypes import PARSER_TEXT_MIMETYPE
 
-# prevents unexpected results on Windows
-# see http://bugs.python.org/issue10551
+# Prevent unexpected results on Windows.
+# See https://bugs.python.org/issue10551
 mimetypes.init(mimetypes.knownfiles)
 
 MIMETYPES_MORE = {
@@ -31,7 +31,7 @@
     ".ots": "application/vnd.oasis.opendocument.spreadsheet-template",
     ".otp": "application/vnd.oasis.opendocument.presentation-template",
     ".otg": "application/vnd.oasis.opendocument.graphics-template",
-    # some systems (like Mac OS X) don't have some of these:
+    # Some systems (such as macOS) don't have some of these:
     ".patch": "text/x-diff",
     ".diff": "text/x-diff",
     ".py": "text/x-python",
@@ -60,13 +60,12 @@
     ".targz": "application/x-gtar",
 }
 
-# add all mimetype patterns of pygments
+# Add all MIME type patterns from Pygments
 for name, short, patterns, mime in pygments.lexers.get_all_lexers():
     for pattern in patterns:
         if pattern.startswith("*.") and mime:
             if pattern in ("*.txt",):
-                # there are some pygments lexers that claim *.txt for different
-                # stuff than text/plain, we do not want that.
+                # Some Pygments lexers claim *.txt for types other than text/plain; skip those.
                 continue
             MIMETYPES_MORE[pattern[1:]] = mime[0]
 
@@ -74,7 +73,7 @@
     mimetypes.add_type(mimetype, ext, True)
 
 MIMETYPES_sanitize_mapping = {
-    # this stuff is text, but got application/* for unknown reasons
+    # These types are text but sometimes get application/* for unknown reasons
     ("application", "docbook+xml"): ("text", "docbook"),
     ("application", "x-latex"): ("text", "latex"),
     ("application", "x-tex"): ("text", "tex"),
@@ -88,7 +87,7 @@
 
 
 class MimeType:
-    """represents a mimetype like text/plain"""
+    """Represents a MIME type such as text/plain."""
 
     def __init__(self, mimestr=None, filename=None):
         self.major = self.minor = None  # sanitized mime type and subtype
@@ -108,8 +107,9 @@ def parse_filename(self, filename):
         self.parse_mimetype(mtype)
 
     def parse_mimetype(self, mimestr):
-        """take a string like used in content-type and parse it into components,
-        alternatively it also can process some abbreviated string like "wiki"
+        """Parse a Content-Type-like string into components.
+
+        Also accepts abbreviated forms such as "wiki".
         """
         parameters = mimestr.split(";")
         parameters = [p.strip() for p in parameters]
@@ -131,10 +131,10 @@ def parse_mimetype(self, mimestr):
         self.sanitize()
 
     def parse_format(self, format):
-        """maps from what we currently use on-page in a #format xxx processing
-        instruction to a sanitized mimetype major, minor tuple.
-        can also be user later for easier entry by the user, so he can just
-        type "wiki" instead of "text/x.moin.wiki".
+        """Map on-page #format values to a sanitized (major, minor) MIME type tuple.
+
+        This can also be used for easier user input, so a user can type
+        "wiki" instead of "text/x.moin.wiki".
         """
         format = format.lower()
         if format in PARSER_TEXT_MIMETYPE:
@@ -148,22 +148,25 @@ def parse_format(self, format):
         return mimetype
 
     def sanitize(self):
-        """convert to some representation that makes sense - this is not necessarily
-        conformant to /etc/mime.types or IANA listing, but if something is
-        readable text, we will return some ``text/*`` mimetype, not ``application/*``,
-        because we need text/plain as fallback and not application/octet-stream.
+        """Convert to a sensible representation.
+
+        This is not necessarily conformant to /etc/mime.types or the IANA listing,
+        but if something is readable text, we return a ``text/*`` MIME type, not
+        ``application/*``, because we need text/plain as a fallback (not
+        application/octet-stream).
         """
         self.major, self.minor = MIMETYPES_sanitize_mapping.get((self.major, self.minor), (self.major, self.minor))
 
     def spoil(self):
-        """this returns something conformant to /etc/mime.type or IANA as a string,
-        kind of inverse operation of sanitize(), but doesn't change self
+        """Return a string conformant to /etc/mime.types or IANA.
+
+        This is the inverse operation of sanitize(), but it does not modify self.
         """
         major, minor = MIMETYPES_spoil_mapping.get((self.major, self.minor), (self.major, self.minor))
         return self.content_type(major, minor)
 
     def content_type(self, major=None, minor=None, charset=None, params=None):
-        """return a string suitable for Content-Type header"""
+        """Return a string suitable for a Content-Type header."""
         major = major or self.major
         minor = minor or self.minor
         params = params or self.params or {}
@@ -177,26 +180,26 @@ def content_type(self, major=None, minor=None, charset=None, params=None):
         return ";".join(params)
 
     def mime_type(self):
-        """return a string major/minor only, no params"""
+        """Return a string containing only major/minor, no parameters."""
         return f"{self.major}/{self.minor}"
 
     def as_attachment(self, cfg):
-        # for dangerous files (like .html), when we are in danger of cross-site-scripting attacks,
-        # we just let the user store them to disk ('attachment').
-        # For safe files, we directly show them inline (this also works better for IE).
+        # For dangerous files (like .html) where cross-site-scripting attacks are a risk,
+        # we let the user store them to disk (as an 'attachment').
+        # For safe files, we display them inline (this also works better for IE).
         mime_type = self.mime_type()
         return mime_type in cfg.mimetypes_xss_protect
 
     def module_name(self):
-        """convert this mimetype to a string useable as python module name,
-        we yield the exact module name first and then proceed to shorter
-        module names (useful for falling back to them, if the more special
-        module is not found) - e.g. first "text_python", next "text".
-        Finally, we yield "application_octet_stream" as the most general
-        mimetype we have.
+        """Convert this MIME type to strings usable as Python module names.
+
+        We yield the most specific module name first and then proceed to shorter
+        names (useful for falling back if a more specific module is not found),
+        e.g., first "text_python", then "text". Finally, we yield
+        "application_octet_stream" as the most general MIME type.
 
         Hint: the fallback handler module for text/* should be implemented
-        in module "text" (not "text_plain")
+        in module "text" (not "text_plain").
         """
         mimetype = self.mime_type()
         modname = mimetype.replace("/", "_").replace("-", "_").replace(".", "_")
diff --git a/src/moin/utils/monkeypatch.py b/src/moin/utils/monkeypatch.py
index 9ea571671..b43dd21b8 100644
--- a/src/moin/utils/monkeypatch.py
+++ b/src/moin/utils/monkeypatch.py
@@ -1,13 +1,13 @@
 # Copyright: 2010 MoinMoin:ThomasWaldmann
 # Copyright: 2025 MoinMoin Project
-# License: the individual patches have same license as the code they are patching
+# License: The individual patches have the same license as the code they patch.
 
 """
-This module contains some monkeypatching for 3rd party code we use.
+This module contains some monkey patching for third-party code we use.
 
-We hope that any 3rd party might find this code useful and will adopt it,
-so we don't need to patch it any more. If you adopt some code from here,
-please notify us, so we can remove it from here.
+We hope that upstream projects find this code useful and adopt it, so we don't
+need to patch it anymore. If you adopt some code from here, please notify us so
+we can remove it from here.
 """
 
 
@@ -32,7 +32,7 @@ def log(self, type, message, *args):
 # Whoosh patching ------------------------------------------------------------
 
 # Reset buffer on close
-# see github issues #1645 and #1961
+# See GitHub issues #1645 and #1961
 
 from whoosh.filedb.structfile import BufferFile
 
diff --git a/src/moin/utils/notifications.py b/src/moin/utils/notifications.py
index 4bb9b3e19..a56e40f9e 100644
--- a/src/moin/utils/notifications.py
+++ b/src/moin/utils/notifications.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - Notifications
+MoinMoin - notifications.
 """
 
 from io import BytesIO
@@ -48,9 +48,9 @@
 
 
 def msgs():
-    """Encapsulates the main notification messages
+    """Encapsulate the main notification messages.
 
-    :return: a dictionary of notification messages
+    :return: A dictionary of notification messages.
     """
     _ = lambda x: x  # noqa
     messages = {
@@ -72,7 +72,7 @@ def msgs():
 
 class Notification:
     """
-    Represents a mail notification about an item change
+    Represent a mail notification about an item change.
     """
 
     txt_template = "mail/notification.txt"
@@ -101,9 +101,9 @@ def __init__(self, app, fqname, action, data, meta, new_data, new_meta, **kwargs
         self.notification_sentence = L_(MESSAGES[self.action]).format(**kw)
 
     def get_content_diff(self):
-        """Create a content diff for the last item change
+        """Create a content diff for the last item change.
 
-        :return: list of diff lines
+        :return: A list of diff lines.
         """
         if self.action in [ACTION_TRASH, DESTROY_REV, DESTROY_ALL]:
             contenttype = self.meta[CONTENTTYPE]
@@ -126,10 +126,10 @@ def get_content_diff(self):
         return content._get_data_diff_text(oldfile, newfile)
 
     def get_meta_diff(self):
-        """Create a meta diff for the last item change
+        """Create a metadata diff for the last item change.
 
-        :return: a list of tuples of the format (<change type>, <basekeys>, <value>)
-                 that can be used to format a diff
+        :return: A list of tuples of the format (<change type>, <basekeys>, <value>)
+                 that can be used to format a diff.
         """
         if self.action in [ACTION_TRASH, DESTROY_REV, DESTROY_ALL]:
             old_meta, new_meta = dict(self.meta), dict()
@@ -143,13 +143,13 @@ def get_meta_diff(self):
         return meta_diff
 
     def generate_diff_url(self, domain):
-        """Generate the URL that leads to diff page of the last 2 revisions
+        """Generate the URL to the diff page for the last two revisions.
 
-        :param domain: domain name
-        :return: the absolute URL to the diff page
+        :param domain: Domain name.
+        :return: The absolute URL to the diff page.
 
-        if data/meta are None, then new item is being created
-        if new_data/new_meta is None then item is being deleted or destroyed
+        If data/meta are None, a new item is being created.
+        If new_data/new_meta is None, the item is being deleted or destroyed.
         """
         if self.new_data is None or self.data is None:
             return ""
@@ -157,10 +157,9 @@ def generate_diff_url(self, domain):
         return urljoin(domain, diff_rel_url)
 
     def render_templates(self, content_diff, meta_diff):
-        """Render both plain text and HTML templates by providing all the
-        necessary arguments
+        """Render both plain text and HTML templates.
 
-        :return: tuple consisting of plain text and HTML notification message
+        :return: A tuple consisting of the plain text and HTML notification message.
         """
         meta_diff_txt = list(make_text_diff(meta_diff))
         domain = self.app.cfg.interwiki_map[self.app.cfg.interwikiname]
@@ -194,16 +193,16 @@ def render_templates(self, content_diff, meta_diff):
 
 @item_modified.connect_via(ANY)
 def send_notifications(app, fqname, action, data=None, meta=None, new_data=None, new_meta=None, **kwargs):
-    """Send mail notifications to subscribers on item change
-
-    :param app: local proxy app
-    :param fqname: fqname of the changed item
-    :param action: type of modification - save, rename, destroy...
-    :param data: the item's data, None if item is new
-    :param meta: the item's meta data, None if item is new
-    :param new_data: open file with new data, None if action is delete or destroy
-    :param new_meta: new meta data, None if action is delete or destroy
-    :param kwargs: optional comment
+    """Send mail notifications to subscribers when an item changes.
+
+    :param app: Local proxy app.
+    :param fqname: Fully qualified name of the changed item.
+    :param action: Type of modification (save, rename, destroy, etc.).
+    :param data: The item's data, or None if the item is new.
+    :param meta: The item's metadata, or None if the item is new.
+    :param new_data: Open file with new data, or None if the action is delete or destroy.
+    :param new_meta: New metadata, or None if the action is delete or destroy.
+    :param kwargs: Optional comment.
     """
     if new_meta is None:
         subscribers = {subscriber for subscriber in get_subscribers(**meta) if subscriber.itemid != flaskg.user.itemid}
diff --git a/src/moin/utils/paramparser.py b/src/moin/utils/paramparser.py
index f80ffe6f1..bc2960125 100644
--- a/src/moin/utils/paramparser.py
+++ b/src/moin/utils/paramparser.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - parameter parsing and invoking of extension functions
+MoinMoin - parameter parsing and invoking of extension functions.
 """
 
 from functools import cmp_to_key
@@ -66,15 +66,15 @@ def parse_quoted_separated_ext(
     empty string as a value can be achieved by quoting it.
 
     If a name or value does not start with a quote, then the quote
-    looses its special meaning for that name or value, unless it
+    loses its special meaning for that name or value, unless it
     starts with one of the given prefixes (the parameter is a str
     containing all allowed prefixes.) The prefixes will be returned
     as ParserPrefix() instances in the first element of the tuple
     for that particular argument.
 
     If multiple separators follow each other, this is treated as
-    having None arguments inbetween, that is also true for when
-    space is used as separators (when separator is None), filter
+    having None arguments in between; that is also true for when
+    space is used as a separator (when separator is None); filter
     them out afterwards.
 
     The function can also do bracketing, i.e. parse expressions
diff --git a/src/moin/utils/plugins.py b/src/moin/utils/plugins.py
index 04be3e375..b951c3b06 100644
--- a/src/moin/utils/plugins.py
+++ b/src/moin/utils/plugins.py
@@ -7,7 +7,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - plugin loader
+MoinMoin - Plugin loader.
 """
 
 
@@ -30,23 +30,23 @@ class PluginMissingError(PluginError):
 
 
 class PluginAttributeError(PluginError):
-    """Raised when plugin does not contain an attribtue"""
+    """Raised when a plugin does not contain an attribute."""
 
 
 def importPlugin(cfg, kind, name, function="execute"):
-    """Import wiki or builtin plugin
+    """Import a wiki or built-in plugin.
 
-    Returns <function> attr from a plugin module <name>.
-    If <function> attr is missing, raise PluginAttributeError.
+    Returns the <function> attribute from a plugin module <name>.
+    If the <function> attribute is missing, raise PluginAttributeError.
     If <function> is None, return the whole module object.
 
-    If <name> plugin can not be imported, raise PluginMissingError.
+    If the <name> plugin cannot be imported, raise PluginMissingError.
 
-    kind may be one of 'action', 'macros' or any other
-    directory that exist in MoinMoin or data/plugin.
+    kind may be one of 'action', 'macros', or any other
+    directory that exists in MoinMoin or data/plugin.
 
-    Wiki plugins will always override builtin plugins. If you want
-    specific plugin, use either importWikiPlugin or importBuiltinPlugin
+    Wiki plugins will always override built-in plugins. If you want
+    a specific plugin, use either importWikiPlugin or importBuiltinPlugin
     directly.
 
     :param cfg: wiki config instance
@@ -76,7 +76,7 @@ def importWikiPlugin(cfg, kind, name, function="execute"):
 
 
 def importBuiltinPlugin(kind, name, function="execute"):
-    """Import builtin plugin from MoinMoin package
+    """Import built-in plugin from the MoinMoin package.
 
     See importPlugin docstring.
     """
@@ -87,8 +87,8 @@ def importBuiltinPlugin(kind, name, function="execute"):
 
 
 def importNameFromPlugin(moduleName, name):
-    """Return <name> attr from <moduleName> module,
-    raise PluginAttributeError if name does not exist.
+    """Return the <name> attribute from the <moduleName> module;
+    raise PluginAttributeError if the name does not exist.
 
     If name is None, return the <moduleName> module object.
     """
@@ -104,7 +104,7 @@ def importNameFromPlugin(moduleName, name):
         except AttributeError:
             raise PluginAttributeError
     else:
-        # module now has the toplevel module of <moduleName> (see __import__ docs!)
+        # module now has the top-level module of <moduleName> (see __import__ docs!)
         components = moduleName.split(".")
         for comp in components[1:]:
             module = getattr(module, comp)
diff --git a/src/moin/utils/pysupport.py b/src/moin/utils/pysupport.py
index 8d6a454be..1860d4e6e 100644
--- a/src/moin/utils/pysupport.py
+++ b/src/moin/utils/pysupport.py
@@ -3,7 +3,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Supporting functions for Python magic
+MoinMoin - supporting functions for Python magic.
 """
 
 import os
@@ -19,12 +19,12 @@
 
 def load_package_modules(package_name, package_pathes):
     """
-    Load (import) all modules from some package (except those starting with _).
+    Load (import) all modules from a package (except those starting with "_").
 
-    This is useful if there is some code in the module that runs at import time
-    and registers some code of that module somewhere.
+    This is useful if a module contains code that runs at import time
+    and registers itself somewhere.
 
-    Call this from __init__.py of the same package like this:
+    Call this from a package’s __init__.py like this:
 
         load_package_modules(__name__, __path__)
     """
@@ -72,34 +72,32 @@ def getPackageModules(packagefile):
 
 
 def importName(modulename, name):
-    """Import name dynamically from module
+    """Import a name dynamically from a module.
 
-    Used to do dynamic import of modules and names that you know their
-    names only in runtime.
+    Used to dynamically import an attribute when its name is only known at runtime.
 
     Any error raised here must be handled by the caller.
 
-    :param modulename: full qualified mudule name, e.g. x.y.z
+    :param modulename: fully qualified module name, e.g., x.y.z
     :param name: name to import from modulename
-    :rtype: any object
-    :returns: name from module
+    :rtype: any
+    :returns: the imported object
     """
     module = __import__(modulename, globals(), {}, [name])
     return getattr(module, name)
 
 
 def makeThreadSafe(function, lock=None):
-    """Call with a function you want to make thread safe
+    """Make a function thread-safe.
 
-    Call without lock to make the function thread safe using one lock per
-    function. Call with existing lock object if you want to make several
-    functions use same lock, e.g. all functions that change same data
-    structure.
+    Call without a lock to make the function thread-safe using one lock per
+    function. Call with an existing lock object if you want several functions
+    to use the same lock (e.g., all functions that change the same data structure).
 
-    :param function: function to make thread safe
+    :param function: function to make thread-safe
     :param lock: threading.Lock instance or None
     :rtype: function
-    :returns: function decorated with locking
+    :returns: the function decorated with locking
     """
     if lock is None:
         import threading
diff --git a/src/moin/utils/registry.py b/src/moin/utils/registry.py
index 04f0d1973..e206d9e47 100644
--- a/src/moin/utils/registry.py
+++ b/src/moin/utils/registry.py
@@ -2,11 +2,11 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Module registry
+MoinMoin - module registry.
 
-Every module registers a factory for itself at the registry with a given
-priority.  During the lookup each factory is called with the given arguments and
-can return a callable to consider itself as a match.
+Every module registers a factory for itself in the registry with a given
+priority. During lookup, each factory is called with the given arguments and
+may return a callable to indicate it is a match.
 """
 
 
@@ -37,10 +37,10 @@ def __repr__(self):
 
     def get(self, *args, **kw):
         """
-        Lookup a matching module
+        Look up a matching module.
 
-        Each registered factory is called with the given arguments and
-        the first matching wins.
+        Each registered factory is called with the given arguments, and
+        the first match wins.
         """
         for entry in self._entries:
             conv = entry(*args, **kw)
@@ -60,9 +60,9 @@ def _register(self, entry):
 
     def unregister(self, factory):
         """
-        Unregister a factory
+        Unregister a factory.
 
-        :param factory: Factory to unregister
+        :param factory: Factory to unregister.
         """
         old_entries = self._entries
         entries = [i for i in old_entries if i.factory is not factory]
@@ -75,8 +75,8 @@ def unregister(self, factory):
 class Registry(RegistryBase):
     def register(self, factory, priority=RegistryBase.PRIORITY_MIDDLE):
         """
-        Register a factory
+        Register a factory.
 
-        :param factory: Factory to register. Callable, have to return a class
+        :param factory: Factory to register. Callable that must return a class.
         """
         return self._register(self.Entry(factory, priority))
diff --git a/src/moin/utils/rev_navigation.py b/src/moin/utils/rev_navigation.py
index 25c3541db..a7ac88689 100644
--- a/src/moin/utils/rev_navigation.py
+++ b/src/moin/utils/rev_navigation.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    Helper function to get prior, current, next revisions and mod-times.
+Helper to get prior, current, and next revisions and modification times.
 """
 
 from flask import g as flaskg
@@ -14,7 +14,7 @@
 def prior_next_revs(revid, fqname):
     """
     If viewing a revision other than the current revision,
-    return prior, current, and next revids and time stamps else return None * 6.
+    return prior, current, and next revision IDs and timestamps; otherwise return None * 6.
     """
     try:
         show_revision = request.view_args["rev"] != CURRENT
diff --git a/src/moin/utils/send_file.py b/src/moin/utils/send_file.py
index bf8bc432b..569c51fdb 100644
--- a/src/moin/utils/send_file.py
+++ b/src/moin/utils/send_file.py
@@ -38,11 +38,11 @@
 
 def encode_rfc2231(value, coding="UTF-8", lang=""):
     """
-    Encode a value according to RFC2231/5987.
+    Encode a value according to RFC 2231/5987.
 
-    :param value: the value to encode. must be either unicode or encoded in <coding>.
-    :param coding: the coding (charset) to use. it is a good idea to use 'UTF-8'.
-    :param lang: the language to use. defaults to empty string (no language given).
+    :param value: The value to encode. Must be either Unicode or encoded in <coding>.
+    :param coding: The encoding (charset) to use. It is a good idea to use 'UTF-8'.
+    :param lang: The language to use. Defaults to the empty string (no language given).
     """
     return f"{coding}'{lang}'{quote(value, encoding=coding)}"
 
@@ -65,12 +65,12 @@ def send_file(
     is careful about not assuming that every file is a filesystem file).
 
     This will use the most efficient method available, configured and possible
-    (for filesystem files some more optimizations may be possible that for
+    (for filesystem files some more optimizations may be possible than for
     file-like objects not having a filesystem filename).
     By default it will try to use the WSGI server's file_wrapper support.
-    Alternatively you can set ``USE_X_SENDFILE = True`` in the application's
+    Alternatively, you can set ``USE_X_SENDFILE = True`` in the application's
     config to directly emit an `X-Sendfile` header.  This
-    however requires support of the underlying webserver for `X-Sendfile`.
+    however requires support of the underlying web server for `X-Sendfile`.
 
     send_file will try to guess some stuff for you if you do not provide them:
 
@@ -81,7 +81,7 @@ def send_file(
     If you do not provide enough information, send_file might raise a
     TypeError.
 
-    For extra security you probably want to sent certain files as attachment
+    For extra security you probably want to send certain files as attachments
     (HTML for instance).
 
     Please never pass filenames to this function from user sources without
@@ -101,8 +101,8 @@ def send_file(
     :param file: a file (or file-like) object, you may give it if you either do
                  not have a filesystem filename or if you already have an open
                  file anyway.
-    :param mimetype: the mimetype of the file if provided, otherwise
-                     auto detection happens based on the filename or
+    :param mimetype: The MIME type of the file if provided; otherwise
+                     autodetection happens based on the filename or
                      attachment_filename.
     :param as_attachment: set to `True` if you want to send this file with
                           a ``Content-Disposition: attachment`` header.
@@ -116,7 +116,7 @@ def send_file(
     :param etag: you can give an etag here, None means to try to compute the
                  etag from the file's filesystem metadata (the latter of course
                  only works for filesystem files). If you do not give a
-                 filename, but you use add_etags, you must explicitely provide
+                 filename, but you use add_etags, you must explicitly provide
                  the etag as it can't compute it for that case.
     """
     if filename and not os.path.isabs(filename):
diff --git a/src/moin/utils/show_time.py b/src/moin/utils/show_time.py
index 947da0e23..c7fb86fe7 100644
--- a/src/moin/utils/show_time.py
+++ b/src/moin/utils/show_time.py
@@ -36,20 +36,20 @@ def duration(seconds):
 
 def format_date_time(utc_dt=None, fmt="yyyy-MM-dd HH:mm:ss", interval="datetime"):
     """
-    Add an ISO 8601 alternative to babel's date/time formatting.
+    Add an ISO 8601 alternative to Babel's date/time formatting.
 
-    Visitors who are not logged-in see ISO 8601 formatted dates and times with
-    a "z" suffix indicating the date/time is a UTC Zulu time.
+    Visitors who are not logged in see ISO 8601-formatted dates and times with
+    a "z" suffix indicating the time is UTC (Zulu).
 
-    Logged in users who have selected the ISO 8601 option in usersettings and
-    have set their time zone to UTC in usersettings see date/times with a "z" suffix.
-    Users with a time zone other than UTC see local date/times in ISO 8601 format
+    Logged-in users who have enabled the ISO 8601 option in user settings and
+    set their time zone to UTC see dates/times with a "z" suffix.
+    Users with a time zone other than UTC see local ISO 8601 dates/times
     without the "z" suffix.
 
-    All other logged-in users will see the usual babel date/time formats based upon
+    All other logged-in users see the usual Babel date/time formats based on
     their time zone and locale.
 
-    See https://babel.pocoo.org/en/latest/dates.html#date-fields for babel format syntax.
+    See https://babel.pocoo.org/en/latest/dates.html#date-fields for Babel format syntax.
     """
     if utc_dt is None:
         utc_dt = utcnow()
@@ -57,7 +57,7 @@ def format_date_time(utc_dt=None, fmt="yyyy-MM-dd HH:mm:ss", interval="datetime"
         utc_dt = utcfromtimestamp(utc_dt)
 
     if not flaskg.user.valid:
-        # users who are not logged-in get moin version of ISO 8601: 2019-07-15 07:08:09z
+        # Users who are not logged in get Moin's ISO 8601 style: 2019-07-15 07:08:09z
         return flask_babel.format_datetime(utc_dt, fmt) + "z"
 
     if flaskg.user.iso_8601:
diff --git a/src/moin/utils/subscriptions.py b/src/moin/utils/subscriptions.py
index f6f307374..8caa36969 100644
--- a/src/moin/utils/subscriptions.py
+++ b/src/moin/utils/subscriptions.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    MoinMoin - Subscriptions
+MoinMoin - subscriptions.
 """
 
 import re
@@ -39,10 +39,10 @@
 
 
 def get_subscribers(**meta):
-    """Get all users that are subscribed to the item
+    """Get all users subscribed to the item.
 
-    :param meta: key/value pairs from item metadata - itemid, name, namespace, tags keys
-    :return: a set of Subscriber objects
+    :param meta: Key/value pairs from the item metadata (ITEMID, NAME, NAMESPACE, TAGS).
+    :return: A set of Subscriber objects.
     """
     itemid = meta.get(ITEMID)
     name = meta.get(NAME)
@@ -61,7 +61,7 @@ def get_subscribers(**meta):
     with flaskg.storage.indexer.ix[LATEST_REVS].searcher() as searcher:
         result_iterators = [searcher.search(query, limit=None)]
         subscription_patterns = searcher.lexicon(SUBSCRIPTION_PATTERNS)
-        # looks like whoosh gives us bytes (not str), decode them:
+        # Looks like Whoosh gives us bytes (not str); decode them:
         subscription_patterns = [p if isinstance(p, str) else p.decode() for p in subscription_patterns]
         patterns = get_matched_subscription_patterns(subscription_patterns, **meta)
         result_iterators.extend(searcher.documents(subscription_patterns=pattern) for pattern in patterns)
@@ -79,12 +79,12 @@ def get_subscribers(**meta):
 
 
 def get_matched_subscription_patterns(subscription_patterns, **meta):
-    """Get all the subscriptions with patterns that match at least one of item names
+    """Get all subscriptions whose patterns match at least one of the item names.
 
-    :param subscription_patterns: a list of subscription patterns (the ones that
-                                    start with NAMERE or NAMEPREFIX)
-    :param meta: key/value pairs from item metadata - name and namespace keys
-    :return: a list of matched subscription patterns
+    :param subscription_patterns: A list of subscription patterns (those that
+                                  start with NAMERE or NAMEPREFIX).
+    :param meta: Key/value pairs from the item metadata (NAME and NAMESPACE).
+    :return: A list of matched subscription patterns.
     """
     item_names = meta.get(NAME)
     item_namespace = meta.get(NAMESPACE)
diff --git a/src/moin/utils/thread_monitor.py b/src/moin/utils/thread_monitor.py
index 55524fe5c..b987a214c 100644
--- a/src/moin/utils/thread_monitor.py
+++ b/src/moin/utils/thread_monitor.py
@@ -2,11 +2,10 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-    Thread monitor - Check the state of all threads.
+Thread monitor: check the state of all threads.
 
-    Just call activate_hook() as early as possible in program execution.
-    Then you can trigger the output of tracebacks of all threads
-    by calling trigger_dump().
+Call activate_hook() as early as possible in program execution. Then you can
+trigger the output of tracebacks of all threads by calling trigger_dump().
 """
 
 
@@ -26,13 +25,17 @@ def __init__(self):
         assert hasattr(sys, "_current_frames")  # make sure we have py >= 2.5
 
     def activate_hook(self):
-        """Activates the thread monitor hook. Note that this might interfere
-        with any kind of profiler and some debugging extensions."""
+        """Activate the thread monitor hook.
+
+        This might interfere with profilers and some debugging extensions.
+        """
         self.enabled = True
 
     def trigger_dump(self, dumpfile=None):
-        """Triggers the dump of the tracebacks of all threads.
-        If dumpfile is specified, it is used as the output file."""
+        """Trigger a dump of the tracebacks of all threads.
+
+        If dumpfile is specified, it is used as the output file.
+        """
         if not self.enabled:
             return
         dumpfile = dumpfile or sys.stderr
@@ -44,12 +47,12 @@ def trigger_dump(self, dumpfile=None):
             dumpfile.write(f.getvalue())
 
     def hook_enabled(self):
-        """Returns true if the thread_monitor hook is enabled."""
+        """Return True if the thread monitor hook is enabled."""
         return self.enabled
 
 
 def dump_regularly(seconds):
-    """Dumps the tracebacks every 'seconds' seconds."""
+    """Dump the tracebacks every 'seconds' seconds."""
     activate_hook()
 
     def background_dumper(seconds):
diff --git a/src/moin/utils/tree.py b/src/moin/utils/tree.py
index 9d7e788f7..c0feddd61 100644
--- a/src/moin/utils/tree.py
+++ b/src/moin/utils/tree.py
@@ -2,7 +2,7 @@
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
-MoinMoin - Tree name and element generator
+MoinMoin - Tree name and element generator.
 """
 
 
@@ -11,7 +11,7 @@
 
 class Name(ET.QName):
     """
-    Represents a QName and factory for elements with this QName
+    Represents a QName and a factory for elements with this QName.
     """
 
     def __call__(self, attrib=None, children=(), **extra):
@@ -20,12 +20,12 @@ def __call__(self, attrib=None, children=(), **extra):
 
 class Namespace(str):
     """
-    Represents a namespace and factory for Names within this namespace
+    Represents a namespace and a factory for Names within this namespace.
     """
 
     def __call__(self, name):
         """
-        Create a Name within this namespace
+        Create a Name within this namespace.
 
         :param name: The name within this namespace.
         :returns: A Name
diff --git a/src/moin/wikiutil.py b/src/moin/wikiutil.py
index d5084dc24..2fd064d3b 100644
--- a/src/moin/wikiutil.py
+++ b/src/moin/wikiutil.py
@@ -54,8 +54,8 @@ def clean_input(text, max_len=201):
     replace CR, LF, TAB by whitespace
     delete control chars
 
-    :param text: unicode text to clean (if we get str, we decode)
-    :rtype: unicode
+    :param text: Unicode text to clean (if we get str, we decode it)
+    :rtype: Unicode
     :returns: cleaned text
     """
     # we only have input fields with max 200 chars, but spammers send us more
@@ -78,10 +78,10 @@ def normalize_pagename(name, cfg):
     whitespace that might confuse the users or abuse the wiki, or
     just does not make sense.
 
-    Restrict even more group pages, so they can be used inside acl lines.
+    Restrict group pages further, so they can be used inside ACL lines.
 
-    :param name: page name, unicode
-    :rtype: unicode
+    :param name: page name, Unicode
+    :rtype: Unicode
     :returns: decoded and sanitized page name
     """
     # Strip invalid characters
@@ -95,19 +95,19 @@ def normalize_pagename(name, cfg):
         if not page or page.isspace():
             continue
 
-        # Cleanup group pages.
-        # Strip non alpha numeric characters, keep white space
+        # Clean up group pages.
+        # Strip non-alphanumeric characters, keep whitespace
         if isGroupItem(page):
             page = "".join([c for c in page if c.isalnum() or c.isspace()])
 
-        # Normalize white space. Each name can contain multiple
-        # words separated with only one space. Split handle all
-        # 30 unicode spaces (isspace() == True)
+        # Normalize whitespace. Each name can contain multiple
+        # words separated by a single space. split() handles all
+        # 30 Unicode spaces (isspace() == True)
         page = " ".join(page.split())
 
         normalized.append(page)
 
-    # Assemble components into full pagename
+    # Assemble components into full page name
     name = "/".join(normalized)
     return name
 

From 60d3b023cbbe61595cf89e374f8d97957527a26f Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Mon, 1 Sep 2025 17:01:54 +0200
Subject: [PATCH 3/3] fix for: invalid escape sequence '\ '

---
 src/moin/apps/frontend/views.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/moin/apps/frontend/views.py b/src/moin/apps/frontend/views.py
index 7839b7167..1a61527e5 100644
--- a/src/moin/apps/frontend/views.py
+++ b/src/moin/apps/frontend/views.py
@@ -433,9 +433,9 @@ def search():
     The Jinja template formatting the output may also display data related to the
     search such as the whoosh query, hit counts, and score.
 
-    Two prefixes to the query string are supported. A leading \ causes a browser
-    redirect to the highest scoring search result. A leading > limits the search to
-    an item's subitems.
+    Two prefixes to the query string are supported:
+        * A leading backslash causes a browser redirect to the highest scoring search result.
+        * A leading > limits the search to an item's subitems.
 
     namespaces can be entered in 3 different ways:
         * a leading namespace in in a subitem query: >users/joe red