Cleaned up variable names, streamlined shuffle algorithm.