fixes against go lint (excluding suggestion on this name vs. that in argument