Cleanup to use VisibleBounds