Removed a few references to this-pointer and made some small cosmetic changes