Revert "AUI-1102 - Source formatting"

This reverts commit 42ba75f317c1e3ff1395da826ff53685fe5015a9.
Revert "AUI-1102 Source formatting"

This reverts commit 3f08624d6ac11aa0db83a09cf3bc77efa95697a3.