1) additional refactoring changes; removes iVar declarations and synthesize statements