OTClient: more refactorings