Converted more @property to ivar+setter & getter.