AUI-1328 Source formatting