Move some vars public to private