Bit more cleanup
Bit more cleanup

MushroomObserver/mushroom-observer,MushroomObserver/mushroom-observer,MushroomObserver/mushroom-observer,MushroomObserver/mushroom-observer,MushroomObserver/mushroom-observer,MushroomObserver/mushroom-observer,MushroomObserver/mushroom-observer