[Go style fixes] no underscore variables

see https://code.google.com/p/go-wiki/wiki/CodeReviewComments