Reduced default timeout, little bit refactored