@antony @carolineBda Refactor for readability.