Slight refactoring of MonteCarlo class