Removed obsolete comments, siplified randomization.