Small cosmetic tweaks