Cosmetic clean ups again