Added Xorshift32 randomization along with some code cleanup.