Revert "Format Changes"

This reverts commit 795f0815bc5f79195b3ab1e505e56ca5c313e98a.
Recommit
508 work