small improvement based on go.tools