Shuffle shuffle

Somewhere near improvement I got lost in: