diff --git a/plugins/golang/README.md b/plugins/golang/README.md
index 8bfe3ae3d..979c89010 100644
--- a/plugins/golang/README.md
+++ b/plugins/golang/README.md
@@ -11,27 +11,27 @@ plugins=(... golang)
 
 ## Aliases
 
-| Alias   | Command                 | Description                                                   |
-| ------- | ----------------------- | ------------------------------------------------------------- |
-| gob     | `go build`              | Build your code                                               |
-| goc     | `go clean`              | Removes object files from package source directories          |
-| god     | `go doc`                | Prints documentation comments                                 |
-| gof     | `go fmt`                | Gofmt formats (aligns and indents) Go programs.               |
-| gofa    | `go fmt ./...`          | Run go fmt for all packages in current directory, recursively |
-| gofx    | `go fix`                | Update packages to use a new API                              |
-| gog     | `go get`                | Downloads packages and then installs them to $GOPATH          |
-| gog     | `go get ./...`          | Installs all dependencies in current directory, recursively   |
-| goi     | `go install`            | Compiles and installs packages to $GOPATH                     |
-| gol     | `go list`               | Lists Go packages                                             |
-| gom     | `go mod`                | Access to operations on modules                               |
-| gop     | `cd $GOPATH`            | Takes you to $GOPATH                                          |
-| gopb    | `cd $GOPATH/bin`        | Takes you to $GOPATH/bin                                      |
-| gops    | `cd $GOPATH/src`        | Takes you to $GOPATH/src                                      |
-| gor     | `go run`                | Compiles and runs your code                                   |
-| got     | `go test`               | Runs tests                                                    |
-| gota    | `go test ./...`         | Runs tests in all subdirectories                              |
-| goto    | `go tool`               | Prints all the available tools                                |
-| gotoc   | `go tool compile`       | Generates object file                                         |
-| gotod   | `go tool dist`          | Utility to bootstrap, build and test go runtime               |
-| gotofx  | `go tool fix`           | Fixes an application to use newer features                    |
-| gov     | `go vet`                | Vet examines Go source code and reports suspicious constructs |
+| Alias  | Command           | Description                                                   |
+| ------ | ----------------- | ------------------------------------------------------------- |
+| gob    | `go build`        | Build your code                                               |
+| goc    | `go clean`        | Removes object files from package source directories          |
+| god    | `go doc`          | Prints documentation comments                                 |
+| gof    | `go fmt`          | Gofmt formats (aligns and indents) Go programs.               |
+| gofa   | `go fmt ./...`    | Run go fmt for all packages in current directory, recursively |
+| gofx   | `go fix`          | Update packages to use a new API                              |
+| gog    | `go get`          | Downloads packages and then installs them to $GOPATH          |
+| gog    | `go get ./...`    | Installs all dependencies in current directory, recursively   |
+| goi    | `go install`      | Compiles and installs packages to $GOPATH                     |
+| gol    | `go list`         | Lists Go packages                                             |
+| gom    | `go mod`          | Access to operations on modules                               |
+| gopa   | `cd $GOPATH`      | Takes you to `$GOPATH`                                        |
+| gopb   | `cd $GOPATH/bin`  | Takes you to `$GOPATH/bin`                                    |
+| gops   | `cd $GOPATH/src`  | Takes you to `$GOPATH/src`                                    |
+| gor    | `go run`          | Compiles and runs your code                                   |
+| got    | `go test`         | Runs tests                                                    |
+| gota   | `go test ./...`   | Runs tests in all subdirectories                              |
+| goto   | `go tool`         | Prints all the available tools                                |
+| gotoc  | `go tool compile` | Generates object file                                         |
+| gotod  | `go tool dist`    | Utility to bootstrap, build and test go runtime               |
+| gotofx | `go tool fix`     | Fixes an application to use newer features                    |
+| gov    | `go vet`          | Vet examines Go source code and reports suspicious constructs |
diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index 3ef9da6aa..6d1eb40c2 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -1,11 +1,9 @@
-# install in /etc/zsh/zshrc or your personal .zshrc
-
 # gc
-prefixes=(5 6 8)
-for p in $prefixes; do
-	compctl -g "*.${p}" ${p}l
-	compctl -g "*.go" ${p}g
+for p in 5 6 8; do
+  compctl -g "*.${p}" ${p}l
+  compctl -g "*.go" ${p}g
 done
+unset p
 
 # standard go tools
 compctl -g "*.go" gofmt
@@ -268,7 +266,7 @@ alias goga='go get ./...'
 alias goi='go install'
 alias gol='go list'
 alias gom='go mod'
-alias gop='cd $GOPATH'
+alias gopa='cd $GOPATH'
 alias gopb='cd $GOPATH/bin'
 alias gops='cd $GOPATH/src'
 alias gor='go run'