Ofertie/nclmonitoring

Correct throughput calculation and refactor some code