More cleaning up for clarity, as well as adding more statistics for model verification script