cleanup removed unneeded "this." and renamed private variable to follow the _varname format