Refactor to maximize use of keyword this
Merge pull request #1 from Techowl/refactor

Refactor to maximize use of keyword this