server: refactroing ended