#46 refactoring Server: finished