[Client] Cleaned up visibility calculation