diff --git a/CREDITS.md b/CREDITS.md
index 8b75ab0..dbda2c8 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -1,5 +1,61 @@
 
-##### Credits to
+* David Cooper (main contributor)
+
+  - Detection + output of multiple certificates
+  - several cleanups of server certificate related stuff
+  - extended parsing of TLS ServerHello messages
+  - testssl.sh -e/-E: testing with a mixture of openssl + sockets
+  - more ciphers
+  - finding more TLS extensions via sockets
+  - extensive CN+SAN <--> hostname check
+  - separate check for curves
+  - RFC 7919, key shares extension
+  - parallel mass testing!
+  - RFC <--> OpenSSL cipher name space switches for the command line
+  - numerous fixes
+  - better error msg suppression (not fully installed openssl
+  - GREASE support
+  - TLS 1.3 support
+
+##### Credits also to
+
+* Christoph Badura
+  - NetBSD fixes
+
+* Frank Breedijk
+  - Detection of insecure redirects
+  - JSON and CSV output
+  - CA pinning
+  - Client simulations
+  - CI integration, some test cases for it
+
+ * Steven Danneman
+   - Postgres and MySQL STARTTLS support
+   * MongoDB support
+
+* Mark Felder
+  - lots of cleanups
+  - Shellcheck static analysis
+
+* Laine Gholson
+  - avahi/mDNS support
+  - HTTP2/ALPN
+  - bugfixes
+  - former ARM binary support
+
+* Maciej Grela
+  - colorless handling
+
+* Markus Manzke
+  - Fix for HSTS + subdomains
+  - LibreSSL patch
+
+* Jean Marsault
+  - client auth: ideas, code snipplets
+
+* Thomas Martens
+  - adding colorblind option
+  - no-rfc mapping
 
 * Peter Mosmans
   - started way better cmd line parsing
@@ -9,104 +65,52 @@
 * John Newbigin
   - Proxy support (sockets and openssl)
 
-* Jonathan Roach
-  - TLS_FALLBACK_SCSV checks
-
-* Mark Felder
-  - lots of cleanups
-  - Shellcheck static analysis
-
-* Frank Breedijk
-  - Detection of insecure redirects
-  - JSON and CSV output
-  - CA pinning
-  - Client simulations
-  - CI integration, some test cases for it
-
-* David Cooper
-  - Detection + output of multiple certificates
-  - several cleanups of server certificate related stuff
-  - extended parsing of TLS ServerHello messages
-  - testssl.sh -e/-E: testing with a mixture of openssl + sockets
-  - finding more TLS extensions via sockets
-  - extensive CN+SAN <--> hostname check
-  - separate check for curves
-  - RFC 7919, key shares extension
-  - parallel mass testing!
-  - RFC <--> OpenSSL cipher name space switches for the command line
-  - numerous fixes
-  - GREASE support
-
- * Steven Danneman
-   - Postgres and MySQL STARTTLS support
-
-* Thomas Patzke:
-  - Support of supplying timeout value for openssl connect
-
 * Oleksandr Nosenko
   - non-flat JSON support (--json-pretty)
   - in file output (CSV, JSON flat, JSON non-flat) support of a minimum severity level
 
-* Christoph Badura
-  - NetBSD fixes
+* Jonathan Roach
+  - TLS_FALLBACK_SCSV checks
 
-* Jean Marsault
-  - client auth: ideas, code snipplets
+* Jonathon Rossi
+  - fix for bash3 (Darwin)
+  - and other Darwin fixes
 
-* Maciej Grela
-  - colorless handling
+* Дилян Палаузов
+  - bug fix for 3des report
+  - reported a tricky STARTTLS bug
+
+* Thomas Patzke:
+  - Support of supplying timeout value for openssl connect
 
 * Olivier Paroz
   - conversion xxd --> hexdump stuff
 
+* Jeroen Wiert Pluimers
+  - Darwin binaries support
+
+* Rechi
+  - initial MX stuff
+  - fixes
+
+* Dmitri S
+  - inspiration & help for Darwin port
+
+* Viktor Szépe
+  - color function maker
+
+* Julien Vehent
+  - supplied 1st Darwin binary
+
 * @typingArtist
   - improved BEAST detection
 
 * @f-s
   - ARM binary support
 
-* Jeroen Wiert Pluimers
-  - Darwin binaries support
-
-* Julien Vehent
-  - supplied 1st Darwin binary
-
-* Rechi
-  - initial MX stuff
-  - fixes
-
-* Laine Gholson
-  - avahi/mDNS support
-  - HTTP2/ALPN
-  - bugfixes
-  - former ARM binary support
-
-* Дилян Палаузов
-  - bug fix for 3des report
-  - reported a tricky STARTTLS bug
-
-* Viktor Szépe
-  - color function maker
-
-* Thomas Martens
-  - adding colorblind option
-  - no-rfc mapping
-
-* Jonathon Rossi
-  - fix for bash3 (Darwin)
-  - and other Darwin fixes
-
 * @nvsofts (NV)
   - LibreSSL patch for GOST
 
-* Markus Manzke
-  - Fix for HSTS + subdomains
-  - LibreSSL patch
-
-* Dmitri S
-  - inspiration & help for Darwin port
-
-
 Others I forgot to mention which did give me feedback, bug reports and helped one way or another.