Fixed Randomization, cleaned up the code a bit