clean up use of self