Code reformatting
Revert "Code reformatting"

This reverts commit bba8603e12ec0318dd19b8ba09546dc0743dcd0b.