Correct a godoc message according to a review comment
Small fixes of logics according to review comments