Move some variables to private