finished refactoring of UserClient and TaxiClient