Various Go style fixes

good catch! will revert it