UP: Cosmetic clean up