Use full randomization
refactor variable names, remove dead comments
more variable clarification