- Clean up isVisible as per @statico request