ARC and code cleaning