cleanup
fixed references to self