#3 Cleaning the MonitorService and refactoring the dependencies