AVALANCHE: Little refactoring in background