Fix go idiom feedback
Merge pull request #414 from thockin/cleanups

Fix go idiom feedback