monitoring - fixed the name problem and clean some methods