a little more data cleanup