Misc changes

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

In the code I'm personally not a big fan of alligning myself as most of the time it gives more problems than it solves.

For documentation, I think it's a really good idea to improve readability as you want to make docs as easy to digest as possible (I'm currently rereading parts of PHP documentation, and .... it's not great, but as someone with experience I can slip past those problems, but for newcomers it might be a mine field).