Small improvement to CorePrep