Refactor to maximize use of keyword this