server: refactoring continue