Fixes Go lint errors and a style fix

Done.