Change code so it passes go-lint