Clean up source data to ease comparison