Refactoring client request timeout