Cosmetic cleanup in user view