small refactoring
made servers const in client