A few small cosmetic tweaks