Clean up data type handling