Minor class format changes