Reformat code as in master

Reformat code as in master