Merge pull request #3 from andybons/andybons_golint

fix golint reports