cleaned up CLOS stuff, unified equality