Random Fix

Fixed the non-random randomness
Cleanup

comment cleanup