Misc changes

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.3
| Fixed tickets | 


It'll significantly improves readability, which is way more important in the docs than having nice diffs in PRs.

This change gets a very big :+1: from me.