Improve random cell number choose algo