AUI-1150 Source formatting