Revert Source formatting - does not compile
Revert "Revert Source formatting - does not compile"

This reverts commit ca532808cb282f26d8e5a76c58a1eb53fb180e50.
Proper fix for SF