Minor cleanup to bench tools