cleaned client classes