(UserDefaultVisibility) Minor code cleanup