minor cleanup of visibility