Various Go style fixes
Merge pull request #534 from mfojtik/cleanup

Merged by openshift-bot