reformat core interface classes