Pulled the code for the date combos into a helper class, cleaned up the AddClientWindow