More consistency fixes Is this type of PR allowed? I just see small errors or inconsistencies all over the place and can't help but want to make the code look and read better.
