Minor cosmetic tweaks