Make code more sexy + Add ARC