Clean up.
Update load function to be a bit more discerning.