nit: s/Id/ID/ for go style
Merge pull request #340 from thockin/cleanups

nit: s/Id/ID/ for go style