Reformat code te be PSR-2 compatible
Merge pull request #2764 from SonicGD/go-for-psr-2

Reformat code to be PSR-2 compatible