data type cleanup