Switch to using the self = this convention