Refactored and replaced with @property and @synthesise for getters and setters