Pushing some cleanup code I had.

Also fix random generation to be inclusive low/high.

Signed-off-by: Chris Sanders <zidane@outlook.com>