cleaned up datafidelity a little