Merge "Reformat code"