Visualization refactor

Can we simplify this check?  Looks like there is a redundancy in the condition