Replaced shuffle() code with a simple call to Collections.shuffle().