Issue #13 - cleaning up ivar storage

Remove @synthesize & use self.