Cleaned the code up to make it usable with ARC. (Not done yet.)
…