Redid the style changes for php branch