Simple GraphMC refactored