Addressed go vet issues