- serverside: small refactoring