Updated variable references to reflect lack of @synthesize