diff --git a/go/vt/sqlparser/ast_funcs.go b/go/vt/sqlparser/ast_funcs.go
index 185f03ea98c..7e493ec5618 100644
--- a/go/vt/sqlparser/ast_funcs.go
+++ b/go/vt/sqlparser/ast_funcs.go
@@ -2369,11 +2369,11 @@ func GetFirstSelect(selStmt TableStatement) (*Select, error) {
 	case *Select:
 		return node, nil
 	case *ValuesStatement:
-		return nil, fmt.Errorf("first table_reference is a VALUES")
+		return nil, vterrors.VT12001("first table_reference as VALUES")
 	case *Union:
 		return GetFirstSelect(node.Left)
 	}
-	panic("[BUG]: unknown type for SelectStatement")
+	return nil, vterrors.VT13001(fmt.Sprintf("unknown type for SelectStatement: %T", selStmt))
 }
 
 // GetAllSelects gets all the select statement s
diff --git a/go/vt/sqlparser/ast_rewriting.go b/go/vt/sqlparser/ast_rewriting.go
index 6f3c71cdbe2..05e7e290fc1 100644
--- a/go/vt/sqlparser/ast_rewriting.go
+++ b/go/vt/sqlparser/ast_rewriting.go
@@ -532,7 +532,7 @@ func (er *astRewriter) existsRewrite(cursor *Cursor, node *ExistsExpr) {
 	sel.GroupBy = nil
 }
 
-// rewriteDistinctableAggr removed Distinctable from Max and Min Aggregations as it does not impact the result. But, makes the plan simpler.
+// rewriteDistinctableAggr removed Distinct from Max and Min Aggregations as it does not impact the result. But, makes the plan simpler.
 func (er *astRewriter) rewriteDistinctableAggr(cursor *Cursor, node DistinctableAggr) {
 	if !node.IsDistinct() {
 		return
diff --git a/go/vt/sqlparser/parser.go b/go/vt/sqlparser/parser.go
index b3c19dc9384..8af0018db2a 100644
--- a/go/vt/sqlparser/parser.go
+++ b/go/vt/sqlparser/parser.go
@@ -55,8 +55,7 @@ func yyParsePooled(yylex yyLexer) int {
 		*parser = zeroParser
 		parserPool.Put(parser)
 	}()
-	parse := parser.Parse(yylex)
-	return parse
+	return parser.Parse(yylex)
 }
 
 // Instructions for creating new types: If a type
diff --git a/go/vt/vtgate/planbuilder/operators/expressions.go b/go/vt/vtgate/planbuilder/operators/expressions.go
index 7c9fef25275..f42ec87404d 100644
--- a/go/vt/vtgate/planbuilder/operators/expressions.go
+++ b/go/vt/vtgate/planbuilder/operators/expressions.go
@@ -17,10 +17,7 @@ limitations under the License.
 package operators
 
 import (
-	"fmt"
-
 	"vitess.io/vitess/go/vt/sqlparser"
-	"vitess.io/vitess/go/vt/vterrors"
 	"vitess.io/vitess/go/vt/vtgate/planbuilder/plancontext"
 	"vitess.io/vitess/go/vt/vtgate/semantics"
 )
@@ -128,7 +125,7 @@ func simplifyPredicates(ctx *plancontext.PlanningContext, in sqlparser.Expr) sql
 func getFirstSelect(selStmt sqlparser.TableStatement) *sqlparser.Select {
 	firstSelect, err := sqlparser.GetFirstSelect(selStmt)
 	if err != nil {
-		panic(vterrors.VT12001(fmt.Sprintf("first UNION part not a SELECT: %v", err)))
+		panic(err)
 	}
 	return firstSelect
 }
diff --git a/go/vt/vtgate/planbuilder/operators/horizon_expanding.go b/go/vt/vtgate/planbuilder/operators/horizon_expanding.go
index 2b53bff74f3..dad5ad3a91a 100644
--- a/go/vt/vtgate/planbuilder/operators/horizon_expanding.go
+++ b/go/vt/vtgate/planbuilder/operators/horizon_expanding.go
@@ -95,7 +95,7 @@ func expandSelectHorizon(ctx *plancontext.PlanningContext, horizon *Horizon, sel
 
 	if qp.NeedsDistinct() {
 		op = newDistinct(op, qp, true)
-		extracted = append(extracted, "Distinctable")
+		extracted = append(extracted, "Distinct")
 	}
 
 	if sel.Having != nil {
diff --git a/go/vt/vtgate/planbuilder/operators/phases.go b/go/vt/vtgate/planbuilder/operators/phases.go
index c005c398498..eb6c42b8724 100644
--- a/go/vt/vtgate/planbuilder/operators/phases.go
+++ b/go/vt/vtgate/planbuilder/operators/phases.go
@@ -59,7 +59,7 @@ func (p Phase) String() string {
 	case addAggrOrdering:
 		return "optimize aggregations with ORDER BY"
 	case cleanOutPerfDistinct:
-		return "optimize Distinctable operations"
+		return "optimize Distinct operations"
 	case subquerySettling:
 		return "settle subqueries"
 	case dmlWithInput: