Convert to ARC + small code cleanup