Formatting/logic change for visibility checks