Origin Go Christmas cleaning

As the number of golint problems in Origin code is growing, I decided to fix some of them. I don't want to fix **all** of them in one super-PR as that might break other PR's and force people to rebase.

To get more: `./hack/verify-golint.sh` :-)


or maybe just var?