Fixes Go lint errors and a style fix

It is at the method level.