AUI-1715 - Source formatting