Update code to be in line with tutorial and golangci-lint#1

shaneHowearth wants to merge 4 commits intoruanbekker:masterruanbekker/code-examples:masterfrom

shaneHowearth:mastershaneHowearth/code-examples:masterCopy head branch name to clipboard