Refactor mcc parsing code