Server finalization & refactoring