Bit of rephrasing based on PR comments