Replace getter/setter technique with @property