removed unnecessary pass by reference &$this calls