only own properties set to class

And consistency with rest of file?