diff --git a/CodeTools.md b/CodeTools.md
index cfb18d7e..18ef37f4 100644
--- a/CodeTools.md
+++ b/CodeTools.md
@@ -6,10 +6,15 @@ An overview of tools that will help improve your Go code
 
 ## Code Formatting
 
+### Articles
+
+  - [Formatting Go Code with gofmt](http://golangtutorials.blogspot.com/2011/06/formatting-go-code-with-gofmt.html)
+
+### Tools
+
   - [gofmt](https://golang.org/cmd/gofmt/) - Start with the standard Go code formatter
   - [golint](https://github.com/golang/lint) - Detects style mistakes in Go code
   - [goimports](https://github.com/bradfitz/goimports) - Format code and fix your import statements
-  - [Formatting Go Code with gofmt](http://golangtutorials.blogspot.com/2011/06/formatting-go-code-with-gofmt.html)
 
 ## Code generation, Templating and Generics
 
@@ -21,12 +26,32 @@ An overview of tools that will help improve your Go code
   - [sqlgen](https://github.com/drone/sqlgen) - Generate Go code for SQL interactions.
 
 ## Refactoring
+
+### Articles
+
   - [Refactoring with go fmt](http://spf13.com/post/go-fmt/)
   - [gorename - easy refactoring](https://texlution.com/post/gorename/)
+  - [Refectoring Tools](http://blog.ralch.com/tutorial/golang-tools-refactoring/) - An overview of refactoring tools for Go.
+
+### Tools
+
+- [eg](https://godoc.org/golang.org/x/tools/cmd/eg) - Example-based refactoring tool for Go
+- [gofmt](https://golang.org/cmd/gofmt/) - Start with the standard Go code formatter
+- [gorename](https://golang.org/x/tools/refactor/rename) - Renaming tool for Go
 
 ## Error Detection
 
+### Articles
+
+  - [Go Inspection Tools](http://blog.ralch.com/tutorial/golang-tools-inspection/) - An overview of tools for Go code inspection.
+  -
+### Tools
+
+  - [DeferCheck, StructCheck, VarCheck](https://github.com/opennota/check/) - A suite of tools for checking your code.
+  - [errcheck](https://github.com/kisielk/errcheck) - Ensure you check your error conditions.
   - [go vet](http://golang.org/cmd/vet/) - Read this first on how to use the `go vet` command.
+  - [SafeSQL](https://github.com/stripe/safesql) - Protect against unsafe SQL in your code.
+  -
 
 ## Navigation