Fix memory leak
Migrate to ARC