#100 Merge the two handleSuccess methods into one