Some cosmetic tweaks