Cleanup: tweak object class