Add Fisher-Yates shuffle. Cleanup code.