Code cleanup, and make sure we get repeatable data.
Code cleanup, and make sure we get repeatable data.