First refactor of AnalizoMetricCollector finished