Reformat of file
Merge of pull