diff --git a/README.md b/README.md
index 4892948..5782569 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-You can download this book in the following formats: [PDF][12], [Mobi][13] and
-[ePub][14].
+You can download this book in the following formats: [PDF][9], [Mobi][10] and
+[ePub][11].
 
 # Introduction
 
@@ -7,15 +7,15 @@ Go Language - Web Application Secure Coding Practices is a guide written for
 anyone who is using the [Go Programming Language][1] and aims to use it for web
 development.
 
-This book is collaborative effort of [Checkmarx Security Research Team][2] and
-it follows the
-[OWASP Secure Coding Practices - Quick Reference Guide v2 (stable)][3] release.
+It was originally created by [Checkmarx Security Research Team][2] and later
+donated to the OWASP Foundation: see the [project page][13]. The book follows
+the [OWASP Secure Coding Practices - Quick Reference Guide v2 (stable)][3]
+release.
 
 The main goal of this book is to help developers avoid common mistakes while at
-the same time, learning a new programming language through a
-"hands-on approach".
-This book provides a good level of detail on "how to do it securely" showing
-what kind of security problems could arise during development.
+the same time, learning a new programming language through a "hands-on
+approach". This book provides a good level of detail on "how to do it securely"
+showing what kind of security problems could arise during development.
 
 ## The Audience for this Book
 
@@ -23,11 +23,11 @@ The primary audience of the Go Secure Coding Practices Guide is developers,
 particularly the ones with previous experience with other programming languages.
 
 The book is also a great reference to those learning programming for the first
-time, who have already finish the [Go tour][8].
+time, who have already finish the [Go tour][7].
 
 ## What You Will Learn
 
-This book covers the [OWASP Secure Coding Practices Guide][15] topic-by-topic,
+This book covers the [OWASP Secure Coding Practices Guide][12] topic-by-topic,
 providing examples and recommendations using Go, to help developers avoid common
 mistakes and pitfalls.
 
@@ -40,7 +40,7 @@ This book was adapted for Go Language from The [Secure Coding Practices Quick
 Reference Guide][3], an [OWASP][4] - Open Web Application Security Project. It
 is a "_technology agnostic set of general software security coding practices, in
 a comprehensive checklist format, that can be integrated into the development
-lifecycle_" ([source][15]).
+lifecycle_" ([source][12]).
 
 [OWASP][4] itself is "_an open community dedicated to enabling organizations to
 conceive, develop, acquire, operate, and maintain applications that can be
@@ -58,9 +58,7 @@ If you're curious about how we built it from scratch, read the
 This document is released under the Creative Commons Attribution-ShareAlike 4.0
 International license (CC BY-SA 4.0). For any reuse or distribution, you must
 make clear to others the license terms of this work.
-[https://creativecommons.org/licenses/by-sa/4.0/][11]
-
-
+[https://creativecommons.org/licenses/by-sa/4.0/][8]
 
 [1]: https://golang.org
 [2]: http://chkmrx.co/2sffXFr
@@ -68,12 +66,10 @@ make clear to others the license terms of this work.
 [4]: https://owasp.org/
 [5]: https://owasp.org/about/
 [6]: src/howto-contribute.md
-[7]: https://www.twitter.com/checkmarx
-[8]: https://go.dev/tour/
-[9]: https://checkmarx.gitbooks.io/go-scp/
-[10]: https://www.gitbook.com/book/checkmarx/go-scp/
-[11]: https://creativecommons.org/licenses/by-sa/4.0/
-[12]: dist/go-webapp-scp.pdf
-[13]: dist/go-webapp-scp.mobi
-[14]: dist/go-webapp-scp.epub
-[15]: https://owasp.org/www-project-secure-coding-practices-quick-reference-guide/#div-download
+[7]: https://go.dev/tour/
+[8]: https://creativecommons.org/licenses/by-sa/4.0/
+[9]: dist/go-webapp-scp.pdf
+[10]: dist/go-webapp-scp.mobi
+[11]: dist/go-webapp-scp.epub
+[12]: https://owasp.org/www-project-secure-coding-practices-quick-reference-guide/#div-download
+[13]: https://owasp.org/www-project-go-secure-coding-practices-guide/