Refactor use of dealer, simplify constructor