Refactoring of JMX Collector