Refactored MCCMarking