Increase timeout to 60 sec... small refactor.