Some more tweaks

* Some more white space corrections
* Reversal of earlier `_a` and `_e` to `_b` change