Add Fisher-Yates shuffle. Cleanup code.
typo
Add the Fisher-Yates shuffle, and code cleanup.