Reformat files with make format

Reformat files with make format #1345