Better data type formatting