Added total infection + Code cleanup