Fix code that triggers go vet errors
Merge pull request #51 from mattoddie/fix-go-vet-errors

Fix code that triggers go vet errors