Cosmetic tweaks

These commits fix a few inconsistencies and are merely cosmetic.