Fixes Go lint errors and a style fix

"It returns ..." (drop the "And")