Minor cleanup. Removing unneccessary this. calls, and removing
unneccessary get/sets.