Some minor cosmetic tweaks