Changing instance variables to @property