* modernize ivars
* modernize ivars in PGFactory