Fixes Go lint errors and a style fix

this feels verbose and unnecessary.