* modernize ivars