Merge branch 'selhorn-rebase-cleaning-up' into 'master'

Edits for easier scanning

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138718



Merged-by: Illya Klymov <xanf@xanf.me>
Approved-by: Illya Klymov <xanf@xanf.me>
Approved-by: Evan Read <eread@gitlab.com>
Reviewed-by: Evan Read <eread@gitlab.com>
Co-authored-by: Evan Read <eread@gitlab.com>
Co-authored-by: Suzanne Selhorn <sselhorn@gitlab.com>