Improve shuffle
Style fixes