Fix Findbugs warning related to Random

Partially revert latest changes - creating new Random object each iteration
isn't a good programming practice (Random may not be so random this way).
+ some little variables reordering.

Signed-off-by: Piotr Bocheński <bochenski.piotr@gmail.com>