Make cosmetic improvements