tiny formatting cleanup
a bit more simple
Fixed, tested, deprecated expandStream