Minor server refactoring