Refactoring serverTimeout from feedback