Minor cleanup to client