Small cleanup to dealer class