Adapt timeout, some small refactorings