Refactoring server.