Added mushroom, cleaned up code