Moved to ARC. Shortened/optimized a few things.