Code cleanup and cross class item recognization