AVALANCHE: Fix some more code formatting