Data.php - reformat code