Prepare to merge format files

I'm sorry for many updated files. I pushed the "Reformat files" button in my IDE and it has done as I sad. I didn't want to revert files manually, so I pushed formatting changes.