Marconi_Server: minor refactoring