Revert "Fixed typo and 'this' references"

This reverts commit f0e9131bfe12d62f7be0bdeb61f31f74c916caf5.