ServerMonitor Fold batch
Code review refactorings