Change timeouts policy
Make little refactoring