only own properties set to class

Indeed ... I'll change that and shrink it into one commit.