AVALANCHE: Move several variables to make them private