got rid of all of the this->