Refinements

Added in some temporary code for random result from the data.

Changed naming of a few variables to make the code more readable.