Clean up and do more consistent evaluation save and load