Revert "Readability - Forgot to put it in a branch, happy to clean anything up obv."

This reverts commit 9997233515ee3247f11fc5d4e73cd3c01a54c715.

Reverting Noel's readability changes, needs to be a branch so can be a PR.