Formatted data better