Get rid of self = this