Cleaned up datautils.