There's not really any need to change this. I think it makes more sense as it was, and the repetition above is confusing.