Refactoring servertimeout