Refactoring servertimeout a little