SVHN clean up, shuffling by default