Cosmetic tweaks and cleanup