Increased the randomness using timestamp.Some cleanup.