Change that to _this as per convention and minor corrections