Fix some minor linting issues

Testing Done:
Ran `golint`, saw fewer lints, and ran `go build .`

Reviewed at https://reviews.imfreedom.org/r/2869/